diff --git a/.github/workflows/runtests.yml b/.github/workflows/runtests.yml index d0fcd0c3..43196bd6 100644 --- a/.github/workflows/runtests.yml +++ b/.github/workflows/runtests.yml @@ -38,7 +38,7 @@ jobs: - '1.11-nightly' - 'nightly' os: ['ubuntu-latest'] - cxxwrap: [ '' ] + cxxwrap: [ '0.14', '0.16' ] fail-fast: false # Service containers to run @@ -101,9 +101,14 @@ jobs: - '1.11-nightly' - '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: @@ -117,6 +122,9 @@ jobs: cache-name: julia-cache;workflow=${{ github.workflow }};julia=${{ matrix.julia-version }};arch=${{ runner.arch }} include-matrix: false cache-scratchspaces: false + - name: "pin CxxWrap" + if: matrix.cxxwrap != '' + run: julia --project -e 'using Pkg; pkg"add CxxWrap@${{ matrix.cxxwrap }}"; pkg"pin CxxWrap";' - uses: julia-actions/julia-runtest@v1 - uses: julia-actions/julia-processcoverage@v1 - uses: codecov/codecov-action@v4 diff --git a/Project.toml b/Project.toml index afd142fb..7daa3d9b 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "Polymake" uuid = "d720cf60-89b5-51f5-aff5-213f193123e7" repo = "https://github.com/oscar-system/Polymake.jl.git" -version = "0.11.21" +version = "0.11.22" [deps] AbstractAlgebra = "c3fe647b-3220-5bb0-a1ea-a7954cac585d" @@ -28,7 +28,7 @@ polymake_oscarnumber_jll = "10f31823-b687-53e6-9f29-edb9d4da9f9f" [compat] AbstractAlgebra = "~0.40.8, ~0.41, ~0.42, ~0.43" BinaryWrappers = "~0.1.0" -CxxWrap = "~0.14" +CxxWrap = "~0.14, ~0.16" Downloads = "^1.4" JSON = "^0.20, ^0.21" Libdl = "^1.6" @@ -44,6 +44,6 @@ SparseArrays = "^1.6" TOPCOM_jll = "~0.17.8" julia = "^1.6" lib4ti2_jll = "^1.6.10" -libpolymake_julia_jll = "~0.12.1" +libpolymake_julia_jll = "~0.12.1, ~0.13.0" polymake_jll = "^400.1200.0" polymake_oscarnumber_jll = "~0.3.1" diff --git a/src/Polymake.jl b/src/Polymake.jl index 420b2b64..accac6bd 100644 --- a/src/Polymake.jl +++ b/src/Polymake.jl @@ -42,7 +42,7 @@ import TOPCOM_jll using libpolymake_julia_jll using polymake_oscarnumber_jll -const jlpolymake_version_range = (v"0.12.0", v"0.13") +const jlpolymake_version_range = (v"0.12.0", v"0.14") struct PolymakeError <: Exception msg