Skip to content

Update CI workflow to use macos-15-intel and improve Windows handling #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pgleeson merged 3 commits into from
May 19, 2026
Merged

Update CI workflow to use macos-15-intel and improve Windows handling #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab77938
Change macOS runner to macos-15-intel
pgleeson May 19, 2026
3550ab9
More general win handling
pgleeson May 19, 2026
cb8dd38
Update GHA versions
pgleeson May 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
fail-fast: false
matrix:
java: [ '8', '11', '16', '17', '19', '21' ]
runs-on: [ubuntu-latest, macos-13, windows-2019] # Note macos-13, not latest/14, due to hdf5 install issue
runs-on: [ubuntu-latest, macos-15-intel, windows-latest] # Note macos-15-intel, not latest/14, due to hdf5 install issue
exclude:
- runs-on: macos-latest
java: "8"
Expand All @@ -26,17 +26,17 @@ jobs:

name: Test on Java ${{ matrix.Java }} on ${{ matrix.runs-on }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Set up JDK ${{ matrix.Java }}
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
java-version: ${{ matrix.Java }}
distribution: 'temurin'

- name: Install and test (non Win)
env:
main_repo_branch: ${GITHUB_REF_NAME}
if: ${{ matrix.runs-on != 'windows-2019' }}
if: ${{ ! contains(matrix.runs-on, 'windows') }}
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
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
mvn dependency:tree

- name: Install and test (Win)
if: ${{ matrix.runs-on == 'windows-2019' }}
if: ${{ contains(matrix.runs-on, 'windows') }}
run: |
# Install org.neuroml.model.injectingplugin

Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,50 +13,50 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: nelonoel/branch-name@v1.0.1

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

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

- name: Install GH import
run: |
python -m pip install --upgrade pip
pip install ghp-import

- name: Checkout NeuroML2
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
repository: NeuroML/NeuroML2
ref: development
path: NeuroML2

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


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

- name: Checkout org.neuroml.model
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
repository: NeuroML/org.neuroml.model
ref: development
Expand Down
Loading