Fix some CI test using old way to get simtest version

AntaresSimulatorTeam · Dec 24, 2024 · 6d5aea3 · 6d5aea3
1 parent 02f6b62
commit 6d5aea3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -170,23 +170,23 @@ jobs:
         run: |
           cd _build
           ctest -C Release --output-on-failure -L "unit|end-to-end"
-      
+
 
       - name: Upload logs for failed tests
         if: ${{ failure() }}
         uses: actions/upload-artifact@v4
         with:
           name: test-log
           path: ${{ github.workspace }}/_build/Testing/Temporary/LastTest.log
-          
+
       - name: Run tests about infinity on BCs RHS
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' && !cancelled() }}
         uses: ./.github/workflows/run-tests
         with:
           simtest-tag: ${{ env.SIMTEST }}
           batch-name: valid-v830
           os: ${{ env.os }}
-          
+
       - name: Run MILP with CBC
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' && !cancelled() }}
         uses: ./.github/workflows/run-tests
@@ -197,18 +197,18 @@ jobs:
           os: ${{ env.os }}
 
       - name: Run tests on adequacy patch (CSR)
-        if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
+        if: ${{ env.RUN_SIMPLE_TESTS == 'true' && !cancelled() }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{steps.simtest-version.outputs.prop}}
+          simtest-tag: ${{ env.SIMTEST }}
           batch-name: adequacy-patch-CSR
           os: ${{ env.os }}
-      
+
       - name: Run parallel tests
         if: ${{ env.RUN_EXTENDED_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{steps.simtest-version.outputs.prop}}
+          simtest-tag: ${{ env.SIMTEST }}
           batch-name: valid-parallel
           os: ${{ env.os }}
           variant: "parallel"

diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml
@@ -188,14 +188,6 @@ jobs:
           batch-name: adequacy-patch-CSR
           os: ${{ env.os }}
 
-      - name: Run tests about infinity on BCs RHS
-        if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
-        uses: ./.github/workflows/run-tests
-        with:
-          simtest-tag: ${{steps.simtest-version.outputs.prop}}
-          batch-name: valid-v830
-          os: ${{ env.test-platform }}
-
       - name: Run tests about infinity on BCs RHS
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' && !cancelled() }}
         uses: ./.github/workflows/run-tests