Skip to content

Commit

Permalink
Merge pull request #504 from oscar-system/bl/ciupd
Browse files Browse the repository at this point in the history
  • Loading branch information
benlorenz authored Jan 31, 2025
2 parents 3ced229 + a77c863 commit 62b5027
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
13 changes: 5 additions & 8 deletions .github/workflows/runtests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,16 @@ jobs:
# github services (for mongodb service) only works on linux
test-with-mongodb:
runs-on: ${{ matrix.os }}
continue-on-error: ${{ matrix.julia-version == '1.11-nightly' || matrix.julia-version == 'nightly' }}
continue-on-error: ${{ matrix.julia-version == '1.12-nightly' || matrix.julia-version == 'nightly' }}
strategy:
matrix:
julia-version:
- '~1.6.0-0'
- '~1.10.0-0'
- '1.11-nightly'
- '1.11'
- 'nightly'
os: ['ubuntu-latest']
cxxwrap: [ '0.14', '0.16' ]
cxxwrap: [ '' ]

fail-fast: false
# Service containers to run
Expand Down Expand Up @@ -91,24 +91,21 @@ jobs:
# this one is only for macos, ubuntu is run with mongodb in the other job
test:
runs-on: ${{ matrix.os }}
continue-on-error: ${{ matrix.julia-version == '1.11-nightly' || matrix.julia-version == 'nightly' }}
continue-on-error: ${{ matrix.julia-version == '1.12-nightly' || matrix.julia-version == 'nightly' }}
env:
JULIA_PKG_SERVER: ""
strategy:
matrix:
julia-version:
- '1.10'
- '1.11-nightly'
- '1.11'
- 'nightly'
os: [ 'macos-14' ] # aarch64
cxxwrap: [ '' ]
include:
- os: 'macos-13' # x86_64
julia-version: '1.6'
cxxwrap: ''
- os: 'macos-14' # x86_64
julia-version: '1.10'
cxxwrap: '0.14'
fail-fast: false

steps:
Expand Down
4 changes: 2 additions & 2 deletions OscarCI.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ julia-version = [ "~1.6.0-0", "~1.10.0-0"]
test = true

[include]
[include.111nightly]
[include.111]
Oscar = "<matching>"
Polymake = ""
julia-version = "1.11-nightly"
julia-version = "1.11"
os = "ubuntu-latest"

[include.nightly]
Expand Down

0 comments on commit 62b5027

Please sign in to comment.