From 7d3aab6e947f63cd2911df25e9ee10d907776326 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Wed, 4 Sep 2024 11:39:26 -0400 Subject: [PATCH] Update GitHub Actions --- .github/workflows/ci.yml | 30 +++++++++++++++++------------- project/build.properties | 2 +- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 79e7f06..22a7a23 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,10 @@ jobs: - os: ubuntu-20.04 java: 8 jobtype: 1 - - os: macos-latest + - os: macos-12 + java: 8 + jobtype: 1 + - os: macos-14 java: 8 jobtype: 1 - os: windows-latest @@ -22,38 +25,39 @@ jobs: JVM_OPTS: -Xms800M -Xmx2G -Xss6M -XX:ReservedCodeCacheSize=128M -server -Dsbt.io.virtual=false -Dfile.encoding=UTF-8 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - distribution: temurin + distribution: zulu java-version: "${{ matrix.java }}" cache: sbt + - uses: sbt/setup-sbt@v1 - name: Set up MinGW - if: ${{ matrix.os != 'macos-latest' }} + if: ${{ runner.os != 'macOS' }} uses: egor-tensin/setup-mingw@v2 with: platform: x64 - name: Set up gcc-aarch64-linux-gnu - if: ${{ matrix.os == 'ubuntu-latest' }} + if: ${{ runner.os == 'Linux' }} shell: bash run: sudo apt-get -y install gcc-aarch64-linux-gnu - name: Build and test (Linux) - if: ${{ matrix.os == 'ubuntu-latest' }} + if: ${{ runner.os == 'Linux' }} shell: bash run: | sbt "jvmfmtCheckAll; clangfmtCheck; buildNativeArtifacts; test" - name: Build and test (macOS) - if: ${{ matrix.os == 'macos-latest' }} + if: ${{ runner.os == 'macOS' }} shell: bash run: sbt "buildNativeArtifacts; test" - name: Build and test (Windows) - if: ${{ matrix.os == 'windows-latest' }} + if: ${{ runner.os == 'Windows' }} shell: bash run: sbt "buildNativeArtifacts; test" - name: Archive native artifacts (Linux) - if: ${{ matrix.os == 'ubuntu-20.04' }} - uses: actions/upload-artifact@v2 + if: ${{ runner.os == 'Linux' }} + uses: actions/upload-artifact@v4 with: name: dist-${{ runner.os }} path: | @@ -61,8 +65,8 @@ jobs: src/main/resources/linux/aarch64/libsbtipcsocket.so src/main/resources/win32/x86_64/sbtipcsocket.dll - name: Archive native artifacts (macOS) - if: ${{ matrix.os == 'macos-latest' }} - uses: actions/upload-artifact@v2 + if: ${{ matrix.os == 'macos-12' }} + uses: actions/upload-artifact@v4 with: name: dist-${{ runner.os }} path: src/main/resources/darwin/x86_64/libsbtipcsocket.dylib diff --git a/project/build.properties b/project/build.properties index 8b9a0b0..ee4c672 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.0 +sbt.version=1.10.1