From d5f4b8a79705b6dff00041f0ee84563d3eb74fa7 Mon Sep 17 00:00:00 2001 From: lread Date: Mon, 17 Mar 2025 14:44:02 -0400 Subject: [PATCH 1/4] ci: bump actions Also added jdk 21 to test matrix --- .github/workflows/ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f816950..3b65c3b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,17 +6,17 @@ jobs: test-jvm: strategy: matrix: - java-version: ["8", "11", "17"] + java-version: ["8", "11", "17", "21"] os: [ubuntu-latest, macOS-latest, windows-latest] runs-on: ${{ matrix.os }} steps: - name: "Checkout code" - uses: "actions/checkout@v2" + uses: "actions/checkout@v4" - name: Prepare java - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: "adopt" java-version: ${{ matrix.java-version }} @@ -29,7 +29,7 @@ jobs: restore-keys: "${{ runner.os }}-deps-" - name: Setup Clojure - uses: DeLaGuardo/setup-clojure@7.0 + uses: DeLaGuardo/setup-clojure@13.2 with: bb: latest @@ -43,10 +43,10 @@ jobs: steps: - name: "Checkout code" - uses: "actions/checkout@v2" + uses: "actions/checkout@v4" - name: Prepare java - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: distribution: "adopt" java-version: 11 @@ -58,7 +58,7 @@ jobs: key: "${{ runner.os }}-deps-${{ hashFiles('deps.edn') }}" restore-keys: "${{ runner.os }}-deps-" - name: Setup Clojure - uses: DeLaGuardo/setup-clojure@7.0 + uses: DeLaGuardo/setup-clojure@13.2 with: bb: latest From 00a444759b31f1218b8079985a1e69f2d97ce417 Mon Sep 17 00:00:00 2001 From: lread Date: Mon, 17 Mar 2025 14:48:22 -0400 Subject: [PATCH 2/4] ci: exclude jdk8 on macos from matrix jdk8 is not available on macos ARM platform --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3b65c3b..494e195 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,10 @@ jobs: strategy: matrix: java-version: ["8", "11", "17", "21"] - os: [ubuntu-latest, macOS-latest, windows-latest] + os: [ubuntu-latest, macos-latest, windows-latest] + exclude: + - os: macos-latest + java-version: "8" runs-on: ${{ matrix.os }} From 3b8d985b8ec4b7da042b89209eae8b54ad222dca Mon Sep 17 00:00:00 2001 From: lread Date: Mon, 17 Mar 2025 14:50:58 -0400 Subject: [PATCH 3/4] ci: on 2nd thought: drop testing of jdk8 And fix missed version bump of action --- .github/workflows/ci.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 494e195..cf48755 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,11 +6,8 @@ jobs: test-jvm: strategy: matrix: - java-version: ["8", "11", "17", "21"] + java-version: ["11", "17", "21"] os: [ubuntu-latest, macos-latest, windows-latest] - exclude: - - os: macos-latest - java-version: "8" runs-on: ${{ matrix.os }} @@ -25,7 +22,7 @@ jobs: java-version: ${{ matrix.java-version }} - name: "Restore Cache" - uses: "actions/cache@v1" + uses: "actions/cache@v4" with: path: "~/.m2/repository" key: "${{ runner.os }}-deps-${{ hashFiles('deps.edn') }}" From 0dd7dda39a2f763b73ca92fe1b68b4aaccd84ed3 Mon Sep 17 00:00:00 2001 From: lread Date: Mon, 17 Mar 2025 14:52:27 -0400 Subject: [PATCH 4/4] ci: missed another action bump! --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf48755..55e4e2b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,7 +52,7 @@ jobs: java-version: 11 - name: "Restore Cache" - uses: "actions/cache@v1" + uses: "actions/cache@v4" with: path: "~/.m2/repository" key: "${{ runner.os }}-deps-${{ hashFiles('deps.edn') }}"