diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index 1af0a43..ef2d5c0 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -25,10 +25,10 @@ jobs: arch: aarch64 # MacOS - name: macos - os: macos-11 + os: macos-13 arch: amd64 - name: macos - os: macos-11 + os: macos-13 arch: aarch64 runs-on: ${{ matrix.os }} steps: @@ -50,36 +50,15 @@ jobs: if: matrix.name == 'macos' run: | uname -a - brew install automake libtool + brew install autoconf automake brew install openjdk@17 - sudo ln -sfn /usr/local/opt/openjdk@17/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk-17.jdk - echo 'export PATH="/usr/local/opt/openjdk@17/bin:$PATH"' >> /Users/runner/.bash_profile - export CPPFLAGS="-I/usr/local/opt/openjdk@17/include" - - brew tap messense/macos-cross-toolchains - # install aarch64-unknown-linux-gnu toolchain - brew install aarch64-unknown-linux-gnu - - # brew install aarch64-elf-gcc - - # brew tap osx-cross/arm - # brew install arm-gcc-bin + echo 'export JAVA_PATH="/usr/local/opt/openjdk@17/libexec/openjdk.jdk:$PATH"' >> /Users/runner/.bash_profile + export CFLAGS="-I$JAVA_PATH/include -I$JAVA_PATH/include/darwin" - name: Build native code - if: matrix.arch == 'amd64' run: | ./compile.sh - - name: Build native code - Linux aarch64 - if: matrix.name == 'linux' && matrix.arch == 'aarch64' - run: | - ./compile.sh aarch64-linux-gnu - - - name: Build native code - MacOS aarch64 - if: matrix.name == 'macos' && matrix.arch == 'aarch64' - run: | - ./compile.sh aarch64-unknown-linux-gnu - - name: Export artifacts linux uses: actions/upload-artifact@v3 with: