ubuntu

AntaresSimulatorTeam · Jul 1, 2024 · b77b36a · b77b36a
1 parent a72f4d1
commit b77b36a
Showing 1 changed file with 14 additions and 22 deletions.
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -132,14 +132,6 @@ jobs:
            cd _build
            ctest -C Release --output-on-failure
 
-      # simtest
-      - name: Read simtest version old action
-        id: simtest-version
-        uses: notiz-dev/github-action-json-property@release
-        with:
-          path: 'simtest.json'
-          prop_path: 'version'
-
       - name: Read simtest version
         run: |
           echo 'simtest<<EOF' >> $GITHUB_ENV
@@ -182,15 +174,15 @@ jobs:
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{steps.simtest-version.outputs.prop}}
+          simtest-tag: ${{ fromJson(env.simtest).version }}
           batch-name: valid-v830
           os: ${{ env.os }}
 
       - name: Run MILP with CBC
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{steps.simtest-version.outputs.prop}}
+          simtest-tag: ${{ fromJson(env.simtest).version }}
           batch-name: valid-milp
           variant: "milp-cbc"
           os: ${{ env.os }}
@@ -199,55 +191,55 @@ jobs:
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{steps.simtest-version.outputs.prop}}
+          simtest-tag: ${{ fromJson(env.simtest).version }}
           batch-name: valid-v860
           os: ${{ env.os }}
 
       - name: Run tests introduced in v870
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{steps.simtest-version.outputs.prop}}
+          simtest-tag: ${{ fromJson(env.simtest).version }}
           batch-name: valid-v870
           os: ${{ env.os }}
 
       - name: Run tests introduced in v910
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{steps.simtest-version.outputs.prop}}
+          simtest-tag: ${{ fromJson(env.simtest).version }}
           batch-name: valid-v910
           os: ${{ env.os }}
 
       - name: Run short-tests
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{steps.simtest-version.outputs.prop}}
+          simtest-tag: ${{ fromJson(env.simtest).version }}
           batch-name: short-tests
           os: ${{ env.os }}
 
       - name: Run mps tests
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{steps.simtest-version.outputs.prop}}
+          simtest-tag: ${{ fromJson(env.simtest).version }}
           batch-name: valid-mps
           os: ${{ env.os }}
 
       - name: Run tests for adequacy patch (CSR)
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{steps.simtest-version.outputs.prop}}
+          simtest-tag: ${{ fromJson(env.simtest).version }}
           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: ${{ fromJson(env.simtest).version }}
           batch-name: valid-parallel
           os: ${{ env.os }}
           variant: "parallel"
@@ -256,7 +248,7 @@ jobs:
         if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{steps.simtest-version.outputs.prop}}
+          simtest-tag: ${{ fromJson(env.simtest).version }}
           batch-name: ts-generator
           os: ${{ env.os }}
           variant: "tsgenerator"
@@ -265,31 +257,31 @@ jobs:
         if: ${{ env.RUN_EXTENDED_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{steps.simtest-version.outputs.prop}}
+          simtest-tag: ${{ fromJson(env.simtest).version }}
           batch-name: medium-tests
           os: ${{ env.os }}
 
       - name: Run long-tests-1
         if: ${{ env.RUN_EXTENDED_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{steps.simtest-version.outputs.prop}}
+          simtest-tag: ${{ fromJson(env.simtest).version }}
           batch-name: long-tests-1
           os: ${{ env.os }}
 
       - name: Run long-tests-2
         if: ${{ env.RUN_EXTENDED_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{steps.simtest-version.outputs.prop}}
+          simtest-tag: ${{ fromJson(env.simtest).version }}
           batch-name: long-tests-2
           os: ${{ env.os }}
 
       - name: Run long-tests-3
         if: ${{ env.RUN_EXTENDED_TESTS == 'true' }}
         uses: ./.github/workflows/run-tests
         with:
-          simtest-tag: ${{steps.simtest-version.outputs.prop}}
+          simtest-tag: ${{ fromJson(env.simtest).version }}
           batch-name: long-tests-3
           os: ${{ env.os }}