diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 2835b67c..b1705eca 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -50,18 +50,18 @@ jobs: path: releases build-macos: name: Build macOS - runs-on: macOS-10.14 + runs-on: macos-latest steps: - uses: actions/checkout@v1 - uses: actions/setup-java@v1 with: java-version: '8.0.212' - name: Setup Env - run: ./scripts/setup.sh macOS-10.14 + run: ./scripts/setup.sh macos-latest - name: Build Jar run: ./scripts/compile-maven.sh - name: Compile Binary - run: ./scripts/build.sh macOS-10.14 + run: ./scripts/build.sh macos-latest - name: Upload Binary uses: actions/upload-artifact@master with: diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index d23cfd7f..4ec4b9d0 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -10,7 +10,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-18.04, windows-2019, macOS-10.14] + os: [ubuntu-18.04, windows-2019, macos-latest] steps: - uses: actions/checkout@v1 - uses: actions/setup-java@v1 diff --git a/scripts/build.sh b/scripts/build.sh index bccf5169..f00e69ae 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -8,7 +8,7 @@ if [ $os = "ubuntu-18.04" ]; then fi #Setup OSX -if [ $os = "macOS-10.14" ]; then +if [ $os = "macos-latest" ]; then export PATH=${PWD}/graalvm-ce-19.0.0/Contents/Home/bin:$PATH export JAVA_HOME=${PWD}/graalvm-ce-19.0.0/Contents/Home/jre ${PWD}/scripts/build-osx.sh diff --git a/scripts/setup.sh b/scripts/setup.sh index ad900822..6a380b15 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -8,7 +8,7 @@ if [ $os = "ubuntu-18.04" ]; then fi #Setup OSX -if [ $os = "macOS-10.14" ]; then +if [ $os = "macos-latest" ]; then echo $os curl -L https://github.com/oracle/graal/releases/download/vm-19.0.0/graalvm-ce-darwin-amd64-19.0.0.tar.gz --output graal.tar.gz gunzip -c graal.tar.gz | tar xopf -