From 0efdb2b20edee434096026645c2fa9be8daa41d3 Mon Sep 17 00:00:00 2001 From: pgleeson Date: Wed, 1 May 2024 10:46:48 +0100 Subject: [PATCH 1/3] Update gha versions --- .github/workflows/ci.yml | 10 ++++++++-- .github/workflows/examples.yml | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ef5f7d1..545fc16 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,12 +18,18 @@ jobs: matrix: java: [ '8', '11', '16', '17', '19' ] runs-on: [ubuntu-latest, macos-latest, windows-latest] + exclude: + - runs-on: macos-latest + java: "8" + - runs-on: macos-latest + java: "16" + name: Test on Java ${{ matrix.Java }} on ${{ matrix.runs-on }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.Java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.Java }} distribution: 'temurin' diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index b3b5947..14fb26b 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: nelonoel/branch-name@v1.0.1 # https://stackoverflow.com/questions/58033366/how-to-get-current-branch-within-github-actions @@ -20,7 +20,7 @@ jobs: id: extract_branch - name: Checkout lems - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: LEMS/LEMS ref: ${{ steps.extract_branch.outputs.branch }} From 6fb24168b2149a79f38e305393402bd51eb81288 Mon Sep 17 00:00:00 2001 From: pgleeson Date: Wed, 1 May 2024 10:49:10 +0100 Subject: [PATCH 2/3] Test java 21 --- .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 545fc16..bd1b099 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - java: [ '8', '11', '16', '17', '19' ] + java: [ '8', '11', '16', '17', '19', '21' ] runs-on: [ubuntu-latest, macos-latest, windows-latest] exclude: - runs-on: macos-latest From 66acec4b1e34c59adfb866426be79c2c07c04f75 Mon Sep 17 00:00:00 2001 From: pgleeson Date: Wed, 1 May 2024 10:51:44 +0100 Subject: [PATCH 3/3] Use src option 8 (1.8) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index eaf7e54..6b726e0 100644 --- a/pom.xml +++ b/pom.xml @@ -29,8 +29,8 @@ maven-compiler-plugin 3.0 - 1.7 - 1.7 + 1.8 + 1.8