From 85b8fce79f95d39ec8c6621f1012b57cc9cc062e Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Fri, 26 Apr 2024 00:07:14 +0000 Subject: [PATCH 1/2] Use latest macOS images --- .cirrus.yml | 7 ------- .github/workflows/ci.yml | 2 +- build.sbt | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 .cirrus.yml diff --git a/.cirrus.yml b/.cirrus.yml deleted file mode 100644 index e39bef5..0000000 --- a/.cirrus.yml +++ /dev/null @@ -1,7 +0,0 @@ -macos_instance: - image: ghcr.io/cirruslabs/macos-ventura-base:latest - -task: - script: - - brew install curl sbt - - sbt test diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2bdcad4..5f75aa0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: name: Build and Test strategy: matrix: - os: [ubuntu-22.04, macos-11, macos-12] + os: [ubuntu-22.04, macos-12, macos-13, macos-14] scala: [2.12] java: [temurin@8] runs-on: ${{ matrix.os }} diff --git a/build.sbt b/build.sbt index 81bf1f4..dcee563 100644 --- a/build.sbt +++ b/build.sbt @@ -7,7 +7,7 @@ ThisBuild / startYear := Some(2022) ThisBuild / tlSonatypeUseLegacyHost := false ThisBuild / githubWorkflowOSes := - Seq("ubuntu-22.04", "macos-11", "macos-12") + Seq("ubuntu-22.04", "macos-12", "macos-13", "macos-14") ThisBuild / githubWorkflowBuildSbtStepPreamble := Seq() From d7bfc45a99cbfa2b5846ec87305516651bcc003f Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Fri, 26 Apr 2024 00:10:00 +0000 Subject: [PATCH 2/2] Java 17 --- .github/workflows/ci.yml | 42 ++++++++++++++++++++-------------------- build.sbt | 2 ++ 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5f75aa0..c0d2630 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: matrix: os: [ubuntu-22.04, macos-12, macos-13, macos-14] scala: [2.12] - java: [temurin@8] + java: [temurin@17] runs-on: ${{ matrix.os }} timeout-minutes: 60 steps: @@ -42,17 +42,17 @@ jobs: with: fetch-depth: 0 - - name: Setup Java (temurin@8) - id: setup-java-temurin-8 - if: matrix.java == 'temurin@8' + - name: Setup Java (temurin@17) + id: setup-java-temurin-17 + if: matrix.java == 'temurin@17' uses: actions/setup-java@v4 with: distribution: temurin - java-version: 8 + java-version: 17 cache: sbt - name: sbt update - if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' + if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' run: sbt +update - name: Install curl @@ -63,18 +63,18 @@ jobs: run: sbt githubWorkflowCheck - name: Check headers and formatting - if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04' + if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-22.04' run: sbt headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck - name: Test run: sbt test - name: Check binary compatibility - if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04' + if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-22.04' run: sbt mimaReportBinaryIssues - name: Generate API documentation - if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04' + if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-22.04' run: sbt doc - name: Make target directories @@ -99,7 +99,7 @@ jobs: strategy: matrix: os: [ubuntu-22.04] - java: [temurin@8] + java: [temurin@17] runs-on: ${{ matrix.os }} steps: - name: Install sbt @@ -111,17 +111,17 @@ jobs: with: fetch-depth: 0 - - name: Setup Java (temurin@8) - id: setup-java-temurin-8 - if: matrix.java == 'temurin@8' + - name: Setup Java (temurin@17) + id: setup-java-temurin-17 + if: matrix.java == 'temurin@17' uses: actions/setup-java@v4 with: distribution: temurin - java-version: 8 + java-version: 17 cache: sbt - name: sbt update - if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' + if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' run: sbt +update - name: Download target directories (2.12) @@ -164,7 +164,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - java: [temurin@8] + java: [temurin@17] runs-on: ${{ matrix.os }} steps: - name: Install sbt @@ -176,17 +176,17 @@ jobs: with: fetch-depth: 0 - - name: Setup Java (temurin@8) - id: setup-java-temurin-8 - if: matrix.java == 'temurin@8' + - name: Setup Java (temurin@17) + id: setup-java-temurin-17 + if: matrix.java == 'temurin@17' uses: actions/setup-java@v4 with: distribution: temurin - java-version: 8 + java-version: 17 cache: sbt - name: sbt update - if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' + if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' run: sbt +update - name: Submit Dependencies diff --git a/build.sbt b/build.sbt index dcee563..932e10b 100644 --- a/build.sbt +++ b/build.sbt @@ -9,6 +9,8 @@ ThisBuild / tlSonatypeUseLegacyHost := false ThisBuild / githubWorkflowOSes := Seq("ubuntu-22.04", "macos-12", "macos-13", "macos-14") +ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17")) + ThisBuild / githubWorkflowBuildSbtStepPreamble := Seq() ThisBuild / githubWorkflowBuildPreamble += {