Skip to content

Commit

Permalink
Merge pull request #98 from NeuroML/experimental
Browse files Browse the repository at this point in the history
Test on java 21
  • Loading branch information
pgleeson authored May 29, 2024
2 parents e332ca5 + 9119be7 commit f570b3f
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 16 deletions.
13 changes: 9 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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-12, windows-2019] # Note macos-12, not latest/14, due to hdf5 install issue
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@v2
- uses: actions/checkout@v4
- name: Set up JDK ${{ matrix.Java }}
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.Java }}
distribution: 'adopt'
Expand Down
21 changes: 11 additions & 10 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,18 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: nelonoel/[email protected]

- name: Set up JDK 11
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: 11
java-package: jdk
distribution: 'temurin'

- name: Set up Python 3.9
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: 3.9

Expand All @@ -33,49 +34,49 @@ jobs:
pip install ghp-import
- name: Checkout NeuroML2
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: NeuroML/NeuroML2
ref: development
path: NeuroML2

- name: Checkout org.lemsml
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: LEMS/jLEMS
ref: development
path: jLEMS

- name: Checkout org.neuroml.model.injectingplugin
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: NeuroML/org.neuroml.model.injectingplugin
ref: development
path: org.neuroml.model.injectingplugin

- name: Checkout org.neuroml1.model
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: NeuroML/org.neuroml1.model
ref: development
path: org.neuroml1.model

- name: Checkout org.neuroml.model
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: NeuroML/org.neuroml.model
ref: development
path: org.neuroml.model

- name: Checkout org.neuroml.export
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: NeuroML/org.neuroml.export
ref: development
path: org.neuroml.export

- name: Checkout org.neuroml.import
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: NeuroML/org.neuroml.import
ref: development
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>

Expand Down

0 comments on commit f570b3f

Please sign in to comment.