From 921a507fc5f56cd659f89a7cfbf211068b9ca920 Mon Sep 17 00:00:00 2001
From: Vincent Payet <vincent.payet@rte-france.com>
Date: Tue, 2 Jul 2024 14:49:00 +0200
Subject: [PATCH] windows workflow

---
 .github/workflows/windows-vcpkg.yml | 37 ++++++++++++++++-------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml
index 9466003473..f22e74e06c 100644
--- a/.github/workflows/windows-vcpkg.yml
+++ b/.github/workflows/windows-vcpkg.yml
@@ -138,17 +138,20 @@ jobs:
           cmake --build _build --config Release -j$(nproc)
 
       - name: Read simtest version
-        shell: bash
         run: |
-          echo 'simtest<<EOF' >> $GITHUB_ENV
+          echo 'SIMTEST_JSON<<EOF' >> $GITHUB_ENV
           cat ./simtest.json >> $GITHUB_ENV
           echo 'EOF' >> $GITHUB_ENV
 
+      - name: Export simtest version
+        run: |
+          echo "SIMTEST=${{ fromJson(env.SIMTEST_JSON).version }}" >> $GITHUB_ENV
+
       - name: Run named mps tests
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{ fromJson(env.simtest).version }}
+          simtest-tag: ${{ env.SIMTEST }}
           batch-name: valid-named-mps
           os: ${{ env.test-platform }}
           variant: "named-mps"
@@ -176,7 +179,7 @@ jobs:
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{ fromJson(env.simtest).version }}
+          simtest-tag: ${{ env.SIMTEST }}
           batch-name: adequacy-patch-CSR
           os: ${{ env.test-platform }}
 
@@ -184,7 +187,7 @@ jobs:
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{ fromJson(env.simtest).version }}
+          simtest-tag: ${{ env.SIMTEST }}
           batch-name: valid-v830
           os: ${{ env.test-platform }}
 
@@ -192,7 +195,7 @@ jobs:
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{ fromJson(env.simtest).version }}
+          simtest-tag: ${{ env.SIMTEST }}
           batch-name: valid-milp
           variant: "milp-cbc"
           os: ${{ env.test-platform }}
@@ -201,7 +204,7 @@ jobs:
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{ fromJson(env.simtest).version }}
+          simtest-tag: ${{ env.SIMTEST }}
           batch-name: valid-v860
           os: ${{ env.test-platform }}
 
@@ -209,7 +212,7 @@ jobs:
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{ fromJson(env.simtest).version }}
+          simtest-tag: ${{ env.SIMTEST }}
           batch-name: valid-v870
           os: ${{ env.test-platform }}
 
@@ -217,7 +220,7 @@ jobs:
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{ fromJson(env.simtest).version }}
+          simtest-tag: ${{ env.SIMTEST }}
           batch-name: valid-v910
           os: ${{ env.test-platform }}
 
@@ -225,7 +228,7 @@ jobs:
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{ fromJson(env.simtest).version }}
+          simtest-tag: ${{ env.SIMTEST }}
           batch-name: short-tests
           os: ${{ env.test-platform }}
 
@@ -233,7 +236,7 @@ jobs:
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{ fromJson(env.simtest).version }}
+          simtest-tag: ${{ env.SIMTEST }}
           batch-name: valid-mps
           os: ${{ env.test-platform }}
 
@@ -241,7 +244,7 @@ jobs:
         if: ${{ env.RUN_EXTENDED_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{ fromJson(env.simtest).version }}
+          simtest-tag: ${{ env.SIMTEST }}
           batch-name: valid-parallel
           os: ${{ env.test-platform }}
           variant: "parallel"
@@ -250,7 +253,7 @@ jobs:
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{ fromJson(env.simtest).version }}
+          simtest-tag: ${{ env.SIMTEST }}
           batch-name: ts-generator
           os: ${{ env.test-platform }}
           variant: "tsgenerator"
@@ -259,7 +262,7 @@ jobs:
         if: ${{ env.RUN_EXTENDED_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{ fromJson(env.simtest).version }}
+          simtest-tag: ${{ env.SIMTEST }}
           batch-name: medium-tests
           os: ${{ env.test-platform }}
 
@@ -267,7 +270,7 @@ jobs:
         if: ${{ env.RUN_EXTENDED_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{ fromJson(env.simtest).version }}
+          simtest-tag: ${{ env.SIMTEST }}
           batch-name: long-tests-1
           os: ${{ env.test-platform }}
 
@@ -275,7 +278,7 @@ jobs:
         if: ${{ env.RUN_EXTENDED_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{ fromJson(env.simtest).version }}
+          simtest-tag: ${{ env.SIMTEST }}
           batch-name: long-tests-2
           os: ${{ env.test-platform }}
 
@@ -283,7 +286,7 @@ jobs:
         if: ${{ env.RUN_EXTENDED_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{ fromJson(env.simtest).version }}
+          simtest-tag: ${{ env.SIMTEST }}
           batch-name: long-tests-3
           os: ${{ env.test-platform }}