From 7e42a134caa34d431586c562cf4daf264f851b87 Mon Sep 17 00:00:00 2001 From: Marco Biscaro Date: Tue, 27 Aug 2024 16:38:06 -0300 Subject: [PATCH] Update GitHub workflows - Use latest actions version - Run test matrix against Java 17 and 21 as well --- .github/workflows/clojure.yml | 43 +++++++++++------------------------ .github/workflows/release.yml | 40 +++++++++----------------------- 2 files changed, 24 insertions(+), 59 deletions(-) diff --git a/.github/workflows/clojure.yml b/.github/workflows/clojure.yml index a82ab0d..dc41d9e 100644 --- a/.github/workflows/clojure.yml +++ b/.github/workflows/clojure.yml @@ -7,37 +7,19 @@ on: branches: [ master ] jobs: - test-using-java-8: - name: 'Test using Java 8' + test-using-java: + strategy: + matrix: + java-version: [ '8', '11', '17', '21' ] + name: Test using Java ${{ matrix.java-version }} runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v4 with: - java-version: 8 - - - name: Print java version - run: java -version - - - name: Install dependencies - run: lein deps - - - name: Run clj tests - run: lein test - - - name: Run midje tests - run: lein midje - - test-using-java-11: - name: 'Test using Java 11' - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - - uses: actions/setup-java@v1 - with: - java-version: 11 + distribution: 'temurin' + java-version: ${{ matrix.java-version }} - name: Print java version run: java -version @@ -55,11 +37,12 @@ jobs: name: 'Lint' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v4 with: - java-version: 11 + distribution: 'temurin' + java-version: 21 - name: Lint check run: lein lint diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 20698e0..9243fad 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,37 +6,19 @@ on: - '*' jobs: - test-using-java-8: - name: 'Test using Java 8' + test-using-java: + strategy: + matrix: + java-version: [ '8', '11', '17', '21' ] + name: Test using Java ${{ matrix.java-version }} runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v4 with: - java-version: 8 - - - name: Print java version - run: java -version - - - name: Install dependencies - run: lein deps - - - name: Run clj tests - run: lein test - - - name: Run midje tests - run: lein midje - - test-using-java-11: - name: 'Test using Java 11' - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - - uses: actions/setup-java@v1 - with: - java-version: 11 + distribution: 'temurin' + java-version: ${{ matrix.java-version }} - name: Print java version run: java -version @@ -53,9 +35,9 @@ jobs: release: name: 'Publish on Clojars' runs-on: ubuntu-latest - needs: [test-using-java-11, test-using-java-8] + needs: test-using-java steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install dependencies run: lein deps