From b4042fd0099c4d6cc03534b2447c25abcd82d362 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Sat, 22 Jun 2024 12:44:15 +1200 Subject: [PATCH 1/8] Update Xpress_jll support --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 4f1b6ac1..cb08e7a5 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.3.0" +Xpress_jll = "=8.13.4, =9.3.0, =9.4.0, =9.4.1" julia = "1.6" [extras] From 5de46f8efaa7abbbc2a16ed036a67b6ff9822bb7 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Sat, 22 Jun 2024 12:44:59 +1200 Subject: [PATCH 2/8] Update Project.toml --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index cb08e7a5..7f46591a 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.3.0, =9.4.0, =9.4.1" +Xpress_jll = "=8.13.4, ~9" julia = "1.6" [extras] From 584e2631086573e1328ba6dd5aded8920da474eb Mon Sep 17 00:00:00 2001 From: odow Date: Mon, 24 Jun 2024 10:28:44 +1200 Subject: [PATCH 3/8] 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] From 6c331c429c80f7d2c9decce1340708c3816598ba Mon Sep 17 00:00:00 2001 From: odow Date: Mon, 24 Jun 2024 10:59:02 +1200 Subject: [PATCH 4/8] Update --- .github/workflows/ci.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 038b324a..72505afc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,18 +37,10 @@ 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 = LATEST_VERSION) - import Xpress_jll - # Older licenses may have expired. Copy license to cwd and then - # install specific version. - 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"]) - end + write("xpauth.xpr", ENV["XPRESS_JL_COMMUNITY_XPAUTH_XPR"]) + Pkg.add(; name = "Xpress_jll", version = ENV["XPRESS_JLL_VERSION"]) env: + XPRESS_JL_COMMUNITY_XPAUTH_XPR: ${{ secrets.XPRESS_JL_COMMUNITY_XPAUTH_XPR }} XPRESS_JLL_VERSION: ${{ matrix.XPRESS_JLL_VERSION }} - uses: julia-actions/julia-runtest@v1 - uses: julia-actions/julia-processcoverage@v1 From bd049476c7e721bcfbf5ee55f429984cdd17a3a3 Mon Sep 17 00:00:00 2001 From: odow Date: Mon, 24 Jun 2024 11:04:33 +1200 Subject: [PATCH 5/8] Update --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 72505afc..8e1826bd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,6 +38,7 @@ jobs: - shell: julia --project=. --color=yes {0} run: | write("xpauth.xpr", ENV["XPRESS_JL_COMMUNITY_XPAUTH_XPR"]) + import Pkg Pkg.add(; name = "Xpress_jll", version = ENV["XPRESS_JLL_VERSION"]) env: XPRESS_JL_COMMUNITY_XPAUTH_XPR: ${{ secrets.XPRESS_JL_COMMUNITY_XPAUTH_XPR }} From e997f02fd799102f282c1a34aafa35cc78a29cd6 Mon Sep 17 00:00:00 2001 From: odow Date: Mon, 24 Jun 2024 11:07:19 +1200 Subject: [PATCH 6/8] Update --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 4d6c4e76..8d2f2a6d 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, ~9" +Xpress_jll = "^8.13, ~9" julia = "1.6" [extras] From a04954f7eaad901d4872c2376376511252839d7e Mon Sep 17 00:00:00 2001 From: odow Date: Mon, 24 Jun 2024 11:44:43 +1200 Subject: [PATCH 7/8] Update --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 8d2f2a6d..97812572 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, ~9" +Xpress_jll = "8.13, 9" julia = "1.6" [extras] From b2eb5e251403a230dc3ccd93d05a4f5076dae4ed Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Mon, 24 Jun 2024 11:56:17 +1200 Subject: [PATCH 8/8] Update ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8e1826bd..e20d2e36 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,11 +37,11 @@ jobs: XPRESS_JL_SKIP_LIB_CHECK: "true" - shell: julia --project=. --color=yes {0} run: | - write("xpauth.xpr", ENV["XPRESS_JL_COMMUNITY_XPAUTH_XPR"]) + write("xpauth.xpr", ENV["XPAUTH_XPR"]) import Pkg Pkg.add(; name = "Xpress_jll", version = ENV["XPRESS_JLL_VERSION"]) env: - XPRESS_JL_COMMUNITY_XPAUTH_XPR: ${{ secrets.XPRESS_JL_COMMUNITY_XPAUTH_XPR }} + XPAUTH_XPR: ${{ secrets.XPAUTH_XPR }} XPRESS_JLL_VERSION: ${{ matrix.XPRESS_JLL_VERSION }} - uses: julia-actions/julia-runtest@v1 - uses: julia-actions/julia-processcoverage@v1