From 584e2631086573e1328ba6dd5aded8920da474eb Mon Sep 17 00:00:00 2001 From: odow Date: Mon, 24 Jun 2024 10:28:44 +1200 Subject: [PATCH] Update --- .github/workflows/ci.yml | 11 ++++++----- Project.toml | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eb1da1f3..038b324a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -37,12 +37,13 @@ jobs: XPRESS_JL_SKIP_LIB_CHECK: "true" - shell: julia --project=. --color=yes {0} run: | + LATEST_VERSION = "9.4.1" import Pkg - Pkg.add(; name = "Xpress_jll", version = "9.3.0") + Pkg.add(; name = "Xpress_jll", version = LATEST_VERSION) import Xpress_jll - # Older licenses may have expired. Copy 9.3.0 license to cwd and then + # Older licenses may have expired. Copy license to cwd and then # install specific version. - if ENV["XPRESS_JLL_VERSION"] != "9.3.0" + if ENV["XPRESS_JLL_VERSION"] != LATEST_VERSION 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"]) diff --git a/Project.toml b/Project.toml index 7f46591a..4d6c4e76 100644 --- a/Project.toml +++ b/Project.toml @@ -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" +Xpress_jll = "~8.13, ~9" julia = "1.6" [extras]