From a8ab94d9592a9e0fd6f38ad495cb1f79646a30c3 Mon Sep 17 00:00:00 2001
From: Oscar Dowson <odow@users.noreply.github.com>
Date: Mon, 24 Jun 2024 12:17:23 +1200
Subject: [PATCH] Update Xpress_jll support (#267)

---
 .github/workflows/ci.yml | 16 +++++-----------
 Project.toml             |  2 +-
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index eb1da1f3..e20d2e36 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,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
diff --git a/Project.toml b/Project.toml
index 4f1b6ac1..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.4, =9.3.0"
+Xpress_jll = "8.13, 9"
 julia = "1.6"
 
 [extras]