From e6ef4de485da2cf92ebee54cb6e2025d57ae7452 Mon Sep 17 00:00:00 2001 From: pgleeson Date: Wed, 1 May 2024 11:38:16 +0100 Subject: [PATCH 1/3] Test on java 21 --- .github/workflows/ci.yml | 13 +++++++++---- .github/workflows/docs.yml | 14 +++++++------- pom.xml | 4 ++-- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a1b56b05..e980149b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,14 +16,19 @@ jobs: strategy: fail-fast: false matrix: - java: [ '8', '11', '16', '17', '19'] - runs-on: [ubuntu-latest, macos-latest, windows-2019 ] + java: [ '8', '11', '16', '17', '19', '21' ] + 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/docs.yml b/.github/workflows/docs.yml index 2d1c5f0d..380031c4 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -13,18 +13,18 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: nelonoel/branch-name@v1.0.1 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 11 distribution: 'temurin' java-package: jdk - name: Set up Python 3.9 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.9 @@ -34,14 +34,14 @@ jobs: pip install ghp-import - name: Checkout NeuroML2 - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: NeuroML/NeuroML2 ref: development path: NeuroML2 - name: Checkout org.lemsml - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: LEMS/jLEMS ref: development @@ -49,14 +49,14 @@ jobs: - name: Checkout org.neuroml.model.injectingplugin - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: NeuroML/org.neuroml.model.injectingplugin ref: development path: org.neuroml.model.injectingplugin - name: Checkout org.neuroml.model - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: NeuroML/org.neuroml.model ref: development diff --git a/pom.xml b/pom.xml index c38acde7..8df75dd3 100644 --- a/pom.xml +++ b/pom.xml @@ -91,8 +91,8 @@ maven-compiler-plugin 3.0 - 1.7 - 1.7 + 1.8 + 1.8 From 2d0159a697e185ecd735bd5eb19468db0294f0c6 Mon Sep 17 00:00:00 2001 From: pgleeson Date: Wed, 1 May 2024 11:42:22 +0100 Subject: [PATCH 2/3] Just test on macos-12 for now... --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e980149b..ef4d9210 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false matrix: java: [ '8', '11', '16', '17', '19', '21' ] - runs-on: [ubuntu-latest, macos-latest, windows-latest] + runs-on: [ubuntu-latest, macos-12, windows-latest] # Note macos-12, not latest/14, due to hdf5 install issue exclude: - runs-on: macos-latest java: "8" @@ -36,7 +36,7 @@ jobs: - name: Install and test (non Win) env: main_repo_branch: ${GITHUB_REF_NAME} - if: ${{ matrix.runs-on != 'windows-2019' }} + if: ${{ matrix.runs-on != 'windows-latest' }} run: | export main_repo_branch=${{env.main_repo_branch}} if [[ ${main_repo_branch} != "master" && ${main_repo_branch} != "development" && ${main_repo_branch} != "experimental" && ${main_repo_branch} != *"osb"* ]]; then main_repo_branch=development ; fi @@ -72,7 +72,7 @@ jobs: mvn dependency:tree - name: Install and test (Win) - if: ${{ matrix.runs-on == 'windows-2019' }} + if: ${{ matrix.runs-on == 'windows-latest' }} run: | # Install org.neuroml.model.injectingplugin From faf1311f84a8fc3bc0b9c204e3c8ca127ab2eefd Mon Sep 17 00:00:00 2001 From: pgleeson Date: Wed, 1 May 2024 11:49:37 +0100 Subject: [PATCH 3/3] Back to windows-2019 --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ef4d9210..922ab123 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false matrix: java: [ '8', '11', '16', '17', '19', '21' ] - runs-on: [ubuntu-latest, macos-12, windows-latest] # Note macos-12, not latest/14, due to hdf5 install issue + runs-on: [ubuntu-latest, macos-12, windows-2019] # Note macos-12, not latest/14, due to hdf5 install issue exclude: - runs-on: macos-latest java: "8" @@ -36,7 +36,7 @@ jobs: - name: Install and test (non Win) env: main_repo_branch: ${GITHUB_REF_NAME} - if: ${{ matrix.runs-on != 'windows-latest' }} + if: ${{ matrix.runs-on != 'windows-2019' }} run: | export main_repo_branch=${{env.main_repo_branch}} if [[ ${main_repo_branch} != "master" && ${main_repo_branch} != "development" && ${main_repo_branch} != "experimental" && ${main_repo_branch} != *"osb"* ]]; then main_repo_branch=development ; fi @@ -72,7 +72,7 @@ jobs: mvn dependency:tree - name: Install and test (Win) - if: ${{ matrix.runs-on == 'windows-latest' }} + if: ${{ matrix.runs-on == 'windows-2019' }} run: | # Install org.neuroml.model.injectingplugin