From 4697b337a5cd6d19396cbb125fec6e74302bc146 Mon Sep 17 00:00:00 2001
From: Andrea Sgattoni <andrea.sgattoni@rte-france.com>
Date: Tue, 7 Nov 2023 11:36:02 +0100
Subject: [PATCH] try use pip for windows-java and python

---
 .github/workflows/windows-java-dotnet.yml | 17 +++++++----------
 .github/workflows/windows-python.yml      | 17 +++++++----------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/windows-java-dotnet.yml b/.github/workflows/windows-java-dotnet.yml
index 9eb0d10af0..8fc603fbdd 100644
--- a/.github/workflows/windows-java-dotnet.yml
+++ b/.github/workflows/windows-java-dotnet.yml
@@ -44,18 +44,15 @@ jobs:
       - name: Check swig
         run: swig -version
 
-      - name: Checkout Xpress windows
-        uses: actions/checkout@v4
-        with:
-          repository: rte-france/xpress-mp-temp
-          path: ${{ env.XPRESSDIR }}
-          ref: "9.0b"
-          token: ${{ secrets.ACCESS_TOKEN }}
-
-      - name: Add xpress bin to path
+      - name: Set-up Xpress with pip
         shell: bash
         run: |
-          echo "${{ env.XPRESS }}" >> $GITHUB_PATH
+          python -m pip install --no-cache-dir "xpress>=9.0,<9.1"
+          XPRESS_DIR="${{ env.pythonLocation }}\Lib\site-packages\xpress"
+          cp -r $XPRESS_DIR/lib $XPRESS_DIR/bin
+          echo "XPRESSDIR=$XPRESS_DIR" >> $GITHUB_ENV
+          echo "XPAUTH_PATH=$XPRESS_DIR\license\community-xpauth.xpr" >> $GITHUB_ENV
+          echo "$XPRESS_DIR/bin" >> $GITHUB_PATH
 
       - name: Check cmake
         run: cmake --version
diff --git a/.github/workflows/windows-python.yml b/.github/workflows/windows-python.yml
index f2f70893eb..763c36dc52 100644
--- a/.github/workflows/windows-python.yml
+++ b/.github/workflows/windows-python.yml
@@ -53,18 +53,15 @@ jobs:
           echo "$((Get-Item ~).FullName)/AppData/Roaming/Python/${{ matrix.python.dir }}/Scripts" |
           Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
 
-      - name: Checkout Xpress windows
-        uses: actions/checkout@v4
-        with:
-          repository: rte-france/xpress-mp-temp
-          path: ${{ env.XPRESSDIR }}
-          ref: "9.0b"
-          token: ${{ secrets.ACCESS_TOKEN }}
-
-      - name: Add xpress bin to path
+      - name: Set-up Xpress with pip
         shell: bash
         run: |
-          echo "${{ env.XPRESS }}" >> $GITHUB_PATH
+          python -m pip install --no-cache-dir "xpress>=9.0,<9.1"
+          XPRESS_DIR="${{ env.pythonLocation }}\Lib\site-packages\xpress"
+          cp -r $XPRESS_DIR/lib $XPRESS_DIR/bin
+          echo "XPRESSDIR=$XPRESS_DIR" >> $GITHUB_ENV
+          echo "XPAUTH_PATH=$XPRESS_DIR\license\community-xpauth.xpr" >> $GITHUB_ENV
+          echo "$XPRESS_DIR/bin" >> $GITHUB_PATH
 
       - name: Check cmake
         run: cmake --version