From f06de58399f370f6e07eab2b4aa90e1d12a2d8fe Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Wed, 18 Dec 2024 12:24:57 +0100 Subject: [PATCH 1/4] Activate long tests on branch release/8.8.x --- .github/workflows/ubuntu.yml | 14 +------------- .github/workflows/windows-vcpkg.yml | 5 ++--- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index ee335104af..2b0a98ab00 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -25,11 +25,9 @@ on: env: GITHUB_TOKEN: ${{ github.token }} IS_RELEASE: ${{ github.event_name == 'workflow_dispatch' }} - RUN_SIMPLE_TESTS: false - RUN_EXTENDED_TESTS: false + RUN_EXTENDED_TESTS: ${{ inputs.target_branch == 'release/8.8.x' }} REF: ${{ inputs.target_branch =='' && github.ref || inputs.target_branch}} VCPKG_ROOT: ${{ github.workspace }}/vcpkg - vcpkgPackages: yaml-cpp antlr4 triplet: x64-linux WX_CONFIG: /usr/bin/wx-config @@ -166,7 +164,6 @@ jobs: - name: Run named mps tests - if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} uses: ./.github/workflows/run-tests with: simtest-tag: ${{steps.simtest-version.outputs.prop}} @@ -175,13 +172,11 @@ jobs: variant: "named-mps" - name: Run unfeasibility-related tests - if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} run: | cd _build ctest -C Release --output-on-failure -R "^unfeasible$" - name: Run unit and end-to-end tests - if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} run: | cd _build ctest -C Release --output-on-failure -L "unit|end-to-end" @@ -194,7 +189,6 @@ jobs: path: ${{ github.workspace }}/_build/Testing/Temporary/LastTest.log - 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}} @@ -202,7 +196,6 @@ jobs: 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}} @@ -211,7 +204,6 @@ jobs: os: ${{ env.os }} - name: Run tests introduced in v860 - if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} uses: ./.github/workflows/run-tests with: simtest-tag: ${{steps.simtest-version.outputs.prop}} @@ -219,7 +211,6 @@ jobs: 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}} @@ -227,7 +218,6 @@ jobs: 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}} @@ -235,7 +225,6 @@ jobs: 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}} @@ -243,7 +232,6 @@ jobs: os: ${{ env.os }} - name: Run tests on adequacy patch - if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} uses: ./.github/workflows/run-tests with: simtest-tag: ${{steps.simtest-version.outputs.prop}} diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index dfe0b5c3ed..98848798b4 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -25,8 +25,7 @@ on: env: GITHUB_TOKEN: ${{ github.token }} IS_RELEASE: ${{ github.event_name == 'workflow_dispatch' }} - RUN_SIMPLE_TESTS: false - RUN_EXTENDED_TESTS: false + RUN_EXTENDED_TESTS: ${{ inputs.target_branch == 'release/8.8.x' }} REF: ${{ inputs.target_branch =='' && github.ref || inputs.target_branch}} @@ -39,7 +38,7 @@ jobs: ORTOOLS_DIR: ${{ github.workspace }}/or-tools os: windows-latest test-platform: windows-2022 - vcpkgPackages: wxwidgets boost-test yaml-cpp antlr4 + vcpkgPackages: wxwidgets boost-test triplet: x64-windows runs-on: windows-latest From 034d559713d02b7c40e28a6f42537a10f5953c4d Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Wed, 18 Dec 2024 12:27:26 +0100 Subject: [PATCH 2/4] All tests for windows --- .github/workflows/windows-vcpkg.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index 98848798b4..bf598ebee7 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -167,7 +167,6 @@ jobs: prop_path: 'version' - name: Run named mps tests - if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} uses: ./.github/workflows/run-tests with: simtest-tag: ${{steps.simtest-version.outputs.prop}} @@ -176,13 +175,11 @@ jobs: variant: "named-mps" - name: Run unfeasibility-related tests - if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} run: | cd _build ctest -C Release --output-on-failure -R "^unfeasible$" - name: Run unit and end-to-end tests - if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} run: | cd _build ctest -C Release --output-on-failure -L "unit|end-to-end" -LE ortools @@ -195,7 +192,6 @@ jobs: path: ${{ github.workspace }}/src/tests/mps - 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}} @@ -203,7 +199,6 @@ jobs: os: ${{ env.test-platform }} - name: Run MILP with CBC - if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} uses: ./.github/workflows/run-tests with: simtest-tag: ${{steps.simtest-version.outputs.prop}} @@ -212,7 +207,6 @@ jobs: os: ${{ env.test-platform }} - name: Run tests introduced in v860 - if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} uses: ./.github/workflows/run-tests with: simtest-tag: ${{steps.simtest-version.outputs.prop}} @@ -220,7 +214,6 @@ jobs: os: ${{ env.test-platform }} - 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}} @@ -228,7 +221,6 @@ jobs: os: ${{ env.test-platform }} - name: Run short-tests - if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} uses: ./.github/workflows/run-tests with: simtest-tag: ${{steps.simtest-version.outputs.prop}} @@ -236,7 +228,6 @@ jobs: os: ${{ env.test-platform }} - name: Run mps tests - if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} uses: ./.github/workflows/run-tests with: simtest-tag: ${{steps.simtest-version.outputs.prop}} @@ -244,13 +235,12 @@ jobs: os: ${{ env.test-platform }} - name: Run tests on adequacy patch - if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} uses: ./.github/workflows/run-tests with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: adequacy-patch-CSR os: ${{ env.test-platform }} - + - name: Run parallel tests if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} From 1aa7f8437697be5f66191c353032e24fc79afafe Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Wed, 18 Dec 2024 12:29:03 +0100 Subject: [PATCH 3/4] Add vckpg_package var back --- .github/workflows/ubuntu.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 2b0a98ab00..50ace260b7 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -28,6 +28,7 @@ env: RUN_EXTENDED_TESTS: ${{ inputs.target_branch == 'release/8.8.x' }} REF: ${{ inputs.target_branch =='' && github.ref || inputs.target_branch}} VCPKG_ROOT: ${{ github.workspace }}/vcpkg + vcpkgPackages: triplet: x64-linux WX_CONFIG: /usr/bin/wx-config From ec908b551ec2fdf085761c7d482cc3f7dd3774c2 Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Wed, 18 Dec 2024 12:32:33 +0100 Subject: [PATCH 4/4] Add vckpg antlr and yaml back --- .github/workflows/ubuntu.yml | 2 +- .github/workflows/windows-vcpkg.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 50ace260b7..f515da97fc 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -28,7 +28,7 @@ env: RUN_EXTENDED_TESTS: ${{ inputs.target_branch == 'release/8.8.x' }} REF: ${{ inputs.target_branch =='' && github.ref || inputs.target_branch}} VCPKG_ROOT: ${{ github.workspace }}/vcpkg - vcpkgPackages: + vcpkgPackages: yaml-cpp antlr4 triplet: x64-linux WX_CONFIG: /usr/bin/wx-config diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index bf598ebee7..5f5cfa53c4 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -38,7 +38,7 @@ jobs: ORTOOLS_DIR: ${{ github.workspace }}/or-tools os: windows-latest test-platform: windows-2022 - vcpkgPackages: wxwidgets boost-test + vcpkgPackages: wxwidgets boost-test yaml-cpp antlr4 triplet: x64-windows runs-on: windows-latest