diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2dc9a0897..1a4d8b69c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macOS-12] + os: [ubuntu-latest, macOS-13] steps: - uses: actions/checkout@v4 with: @@ -50,14 +50,12 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest, macOS-12, macOS-14] + os: [ubuntu-latest, windows-latest, macOS-13, macOS-14] steps: - uses: actions/checkout@v4 with: submodules: true - - uses: coursier/setup-action@v1 - with: - apps: 'sbt' + - uses: sbt/setup-sbt@v1 - uses: coursier/cache-action@v6 - uses: graalvm/setup-graalvm@v1 with: @@ -83,7 +81,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest, macOS-12, macOS-14] + os: [ubuntu-latest, windows-latest, macOS-13, macOS-14] jdk: ["22.3.0", "17"] name: Test ${{ matrix.os }} -- ${{ matrix.jdk }} @@ -99,22 +97,14 @@ jobs: - uses: coursier/setup-action@v1 with: jvm: 'temurin:17' - apps: 'sbt' if: matrix.jdk == '17' - - - uses: coursier/setup-action@v1 - with: - apps: 'sbt' - if: matrix.os == 'macOS-14' && matrix.os == 'macOS-14' - - - uses: coursier/cache-action@v6 - - uses: graalvm/setup-graalvm@v1 with: version: ${{ matrix.jdk }} java-version: '17' - if: matrix.jdk == '22.3.0' - + if: matrix.jdk == '22.3.0' + - uses: coursier/cache-action@v6 + - uses: sbt/setup-sbt@v1 - uses: actions/setup-node@v4 with: node-version: "16" @@ -146,7 +136,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04, macOS-12, macOS-14, windows-latest] + os: [ubuntu-20.04, macOS-13, macOS-14, windows-latest] include: - os: ubuntu-20.04 artifact: bloop-linux @@ -176,9 +166,7 @@ jobs: native-image-job-reports: 'true' github-token: ${{ secrets.GITHUB_TOKEN }} - - uses: coursier/setup-action@v1 - with: - apps: 'sbt' + - uses: sbt/setup-sbt@v1 - name: Publish GraalVM Native artifacts run: sbt "cli/graalvm-native-image:packageBin" @@ -235,6 +223,7 @@ jobs: - uses: coursier/setup-action@v1 with: jvm: 'temurin:17' + - uses: sbt/setup-sbt@v1 - uses: actions/setup-node@v4 with: node-version: "16"