Skip to content

Commit

Permalink
Update Xpress_jll support (#267)
Browse files Browse the repository at this point in the history
  • Loading branch information
odow authored Jun 24, 2024
1 parent 4c7a842 commit a8ab94d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
16 changes: 5 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ jobs:
os: [ubuntu-latest, macOS-latest, windows-latest]
arch: [x64]
# If updating most recent version, change shell script below
XPRESS_JLL_VERSION: ['8.13.4', '9.3.0']
XPRESS_JLL_VERSION: ['8.14.0', '9.4.1']
include:
- version: '1'
os: macos-14
arch: aarch64
XPRESS_JLL_VERSION: '9.3.0'
XPRESS_JLL_VERSION: '9.4.1'
steps:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v2
Expand All @@ -37,17 +37,11 @@ jobs:
XPRESS_JL_SKIP_LIB_CHECK: "true"
- shell: julia --project=. --color=yes {0}
run: |
write("xpauth.xpr", ENV["XPAUTH_XPR"])
import Pkg
Pkg.add(; name = "Xpress_jll", version = "9.3.0")
import Xpress_jll
# Older licenses may have expired. Copy 9.3.0 license to cwd and then
# install specific version.
if ENV["XPRESS_JLL_VERSION"] != "9.3.0"
license_dir = joinpath(dirname(dirname(Xpress_jll.libxprs)), "license")
cp(joinpath(license_dir, "community-xpauth.xpr"), "xpauth.xpr")
Pkg.add(; name = "Xpress_jll", version = ENV["XPRESS_JLL_VERSION"])
end
Pkg.add(; name = "Xpress_jll", version = ENV["XPRESS_JLL_VERSION"])
env:
XPAUTH_XPR: ${{ secrets.XPAUTH_XPR }}
XPRESS_JLL_VERSION: ${{ matrix.XPRESS_JLL_VERSION }}
- uses: julia-actions/julia-runtest@v1
- uses: julia-actions/julia-processcoverage@v1
Expand Down
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
Libdl = "<0.0.1, 1.6"
MathOptInterface = "1.26"
Test = "<0.0.1, 1.6"
Xpress_jll = "=8.13.4, =9.3.0"
Xpress_jll = "8.13, 9"
julia = "1.6"

[extras]
Expand Down

0 comments on commit a8ab94d

Please sign in to comment.