From 6cd09f5942f05f60faa408f5e2614eb8e054a495 Mon Sep 17 00:00:00 2001 From: payetvin <113102157+payetvin@users.noreply.github.com> Date: Wed, 10 Jul 2024 17:40:02 +0200 Subject: [PATCH] Rename test-platform to os for windows CI (#2253) --- .github/workflows/windows-vcpkg.yml | 35 ++++++++++++++--------------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index 3ad4ddaae8..bcd2ef9e5a 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -37,8 +37,7 @@ jobs: # Indicates the location of the vcpkg as a Git submodule of the project repository. VCPKG_ROOT: ${{ github.workspace }}/vcpkg ORTOOLS_DIR: ${{ github.workspace }}/or-tools - os: windows-latest - test-platform: windows-2022 + os: windows-2022 vcpkgPackages: wxwidgets boost-test triplet: x64-windows-release # Caching strategy of VCPKG dependencies @@ -97,7 +96,7 @@ jobs: - name: Download pre-compiled librairies uses: ./.github/workflows/download-extract-precompiled-libraries-zip with: - os: ${{env.os}} + os: windows-latest ortools-url: ${{env.ORTOOLS_URL}} ortools-dir: ${{env.ORTOOLS_DIR}} @@ -155,7 +154,7 @@ jobs: with: simtest-tag: ${{ env.SIMTEST }} batch-name: valid-named-mps - os: ${{ env.test-platform }} + os: ${{ env.os }} variant: "named-mps" - name: Run unfeasibility-related tests @@ -183,7 +182,7 @@ jobs: with: simtest-tag: ${{ env.SIMTEST }} batch-name: adequacy-patch-CSR - os: ${{ env.test-platform }} + os: ${{ env.os }} - name: Run tests about infinity on BCs RHS if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -191,7 +190,7 @@ jobs: with: simtest-tag: ${{ env.SIMTEST }} batch-name: valid-v830 - os: ${{ env.test-platform }} + os: ${{ env.os }} - name: Run MILP with CBC if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -200,7 +199,7 @@ jobs: simtest-tag: ${{ env.SIMTEST }} batch-name: valid-milp variant: "milp-cbc" - os: ${{ env.test-platform }} + os: ${{ env.os }} - name: Run tests introduced in 8.6.0 if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -208,7 +207,7 @@ jobs: with: simtest-tag: ${{ env.SIMTEST }} batch-name: valid-v860 - os: ${{ env.test-platform }} + os: ${{ env.os }} - name: Run tests introduced in 8.7.0 if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -216,7 +215,7 @@ jobs: with: simtest-tag: ${{ env.SIMTEST }} batch-name: valid-v870 - os: ${{ env.test-platform }} + os: ${{ env.os }} - name: Run tests introduced in 9.1.0 if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -224,7 +223,7 @@ jobs: with: simtest-tag: ${{ env.SIMTEST }} batch-name: valid-v910 - os: ${{ env.test-platform }} + os: ${{ env.os }} - name: Run tests introduced in 9.2.0 if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -240,7 +239,7 @@ jobs: with: simtest-tag: ${{ env.SIMTEST }} batch-name: short-tests - os: ${{ env.test-platform }} + os: ${{ env.os }} - name: Run mps tests if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -248,7 +247,7 @@ jobs: with: simtest-tag: ${{ env.SIMTEST }} batch-name: valid-mps - os: ${{ env.test-platform }} + os: ${{ env.os }} - name: Run parallel tests if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} @@ -256,7 +255,7 @@ jobs: with: simtest-tag: ${{ env.SIMTEST }} batch-name: valid-parallel - os: ${{ env.test-platform }} + os: ${{ env.os }} variant: "parallel" - name: Run tests for time series generator tool @@ -265,7 +264,7 @@ jobs: with: simtest-tag: ${{ env.SIMTEST }} batch-name: ts-generator - os: ${{ env.test-platform }} + os: ${{ env.os }} variant: "tsgenerator" - name: Run medium-tests @@ -274,7 +273,7 @@ jobs: with: simtest-tag: ${{ env.SIMTEST }} batch-name: medium-tests - os: ${{ env.test-platform }} + os: ${{ env.os }} - name: Run long-tests-1 if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} @@ -282,7 +281,7 @@ jobs: with: simtest-tag: ${{ env.SIMTEST }} batch-name: long-tests-1 - os: ${{ env.test-platform }} + os: ${{ env.os }} - name: Run long-tests-2 if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} @@ -290,7 +289,7 @@ jobs: with: simtest-tag: ${{ env.SIMTEST }} batch-name: long-tests-2 - os: ${{ env.test-platform }} + os: ${{ env.os }} - name: Run long-tests-3 if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} @@ -298,7 +297,7 @@ jobs: with: simtest-tag: ${{ env.SIMTEST }} batch-name: long-tests-3 - os: ${{ env.test-platform }} + os: ${{ env.os }} - name: Solver archive creation shell: bash