From 3eef5b07ec1a792fff8934ca4d2ee49e37eaa9fb Mon Sep 17 00:00:00 2001
From: odow <o.dowson@gmail.com>
Date: Tue, 8 Apr 2025 10:02:21 +1200
Subject: [PATCH 1/2] Add FrankWolfe.jl to solver-tests.yml

---
 .github/workflows/solver-tests.yml | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/solver-tests.yml b/.github/workflows/solver-tests.yml
index bf6c7c0e20..88f8557ecf 100644
--- a/.github/workflows/solver-tests.yml
+++ b/.github/workflows/solver-tests.yml
@@ -64,6 +64,7 @@ jobs:
           - package: 'DisjunctiveProgramming'
           - package: 'EAGO'
           # - package: 'GAMS'  # Requires license
+          - package: 'FrankWolfe'
           - package: 'InfiniteOpt'
           - package: 'Juniper'
           - package: 'LinearFractional'
@@ -122,41 +123,29 @@ jobs:
       # Setup CPLEX.jl
       - name: Add CPLEX secrets
         if: ${{ matrix.package == 'CPLEX' }}
-        env: 
-          SECRET_CPLEX_URL_2210: ${{ secrets.CPLEX_URL_2210 }}
         shell: bash
         run: |
-          echo "SECRET_CPLEX_URL_2210=${SECRET_CPLEX_URL_2210}" >> $GITHUB_ENV
+          echo "SECRET_CPLEX_URL_2210=${{ secrets.CPLEX_URL_2210 }}" >> $GITHUB_ENV
           echo "CPLEX_VERSION=2210" >> $GITHUB_ENV
       # Setup Gurobi.jl
       - name: Add Gurobi secrets
         if: ${{ matrix.package == 'Gurobi' }}
-        env: 
-          SECRET_GUROBI_LICENSE: ${{ secrets.GUROBI_LICENSE }}
         shell: bash
-        run: |
-          mkdir -p /opt/gurobi
-          echo "${SECRET_GUROBI_LICENSE}" > /opt/gurobi/gurobi.lic
+        run: echo "${{ secrets.GUROBI_LICENSE }}" > ~gurobi.lic
       # Setup KNITRO.jl
       - name: Add KNITRO secrets
         if: ${{ matrix.package == 'KNITRO' }}
-        env:
-          SECRET_KNITRO_LICENSE: ${{ secrets.KNITRO_LICENSE }}
-          SECRET_KNITRO_URL: ${{ secrets.KNITRO_URL }}
-          SECRET_KNITRO_LIBIOMP5: ${{ secrets.KNITRO_LIBIOMP5 }}
         shell: bash
         run: |
-          echo "${SECRET_KNITRO_LICENSE}" > ~/artelys_lic.txt
-          echo "SECRET_KNITRO_URL=${SECRET_KNITRO_URL}" >> $GITHUB_ENV
-          echo "SECRET_KNITRO_LIBIOMP5=${SECRET_KNITRO_LIBIOMP5}" >> $GITHUB_ENV
+          echo "${{ secrets.KNITRO_LICENSE }}" > ~/artelys_lic.txt
+          echo "SECRET_KNITRO_URL=${{ secrets.KNITRO_URL }}" >> $GITHUB_ENV
+          echo "SECRET_KNITRO_LIBIOMP5=${{ secrets.KNITRO_LIBIOMP5 }}" >> $GITHUB_ENV
       # Setup Xpress.jl
       - name: Add Xpress secrets
         if: ${{ matrix.package == 'Xpress' }}
-        env:
-          SECRET_XPRESS_LICENSE: ${{ secrets.XPRESS_LICENSE }}
         shell: bash
         run: |
-          echo "${SECRET_XPRESS_LICENSE}" > /opt/xpauth.xpr
+          echo "${{ secrets.XPRESS_LICENSE }}" > /opt/xpauth.xpr
           echo "XPRESS_JL_SKIP_LIB_CHECK=true" >> $GITHUB_ENV
           echo "XPAUTH_PATH=/opt/xpauth.xpr" >> $GITHUB_ENV
       - name: Run tests

From c0ed4403388f0dbf9aa29118e19f64863fcda659 Mon Sep 17 00:00:00 2001
From: Oscar Dowson <odow@users.noreply.github.com>
Date: Tue, 8 Apr 2025 15:33:22 +1200
Subject: [PATCH 2/2] Update solver-tests.yml

---
 .github/workflows/solver-tests.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/solver-tests.yml b/.github/workflows/solver-tests.yml
index 88f8557ecf..d0d50a30d1 100644
--- a/.github/workflows/solver-tests.yml
+++ b/.github/workflows/solver-tests.yml
@@ -131,7 +131,7 @@ jobs:
       - name: Add Gurobi secrets
         if: ${{ matrix.package == 'Gurobi' }}
         shell: bash
-        run: echo "${{ secrets.GUROBI_LICENSE }}" > ~gurobi.lic
+        run: echo "${{ secrets.GUROBI_LICENSE }}" > ~/gurobi.lic
       # Setup KNITRO.jl
       - name: Add KNITRO secrets
         if: ${{ matrix.package == 'KNITRO' }}
@@ -143,9 +143,11 @@ jobs:
       # Setup Xpress.jl
       - name: Add Xpress secrets
         if: ${{ matrix.package == 'Xpress' }}
+        env:
+          SECRET_XPRESS_LICENSE: ${{ secrets.XPRESS_LICENSE }}
         shell: bash
         run: |
-          echo "${{ secrets.XPRESS_LICENSE }}" > /opt/xpauth.xpr
+          echo "${SECRET_XPRESS_LICENSE}" > /opt/xpauth.xpr
           echo "XPRESS_JL_SKIP_LIB_CHECK=true" >> $GITHUB_ENV
           echo "XPAUTH_PATH=/opt/xpauth.xpr" >> $GITHUB_ENV
       - name: Run tests