From 2b6cd144add3bd1d4bc48cfc2589652a13c56160 Mon Sep 17 00:00:00 2001 From: payetvin <113102157+payetvin@users.noreply.github.com> Date: Thu, 19 Dec 2024 15:51:42 +0100 Subject: [PATCH] Activate long tests on branch release/8.8.x (#2538) --- .github/workflows/ubuntu.yml | 13 +------------ .github/workflows/windows-vcpkg.yml | 15 ++------------- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index ee335104af..f515da97fc 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.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}} VCPKG_ROOT: ${{ github.workspace }}/vcpkg vcpkgPackages: yaml-cpp antlr4 @@ -166,7 +165,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 +173,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 +190,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 +197,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 +205,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 +212,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 +219,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 +226,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 +233,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..5f5cfa53c4 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}} @@ -168,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}} @@ -177,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 @@ -196,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}} @@ -204,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}} @@ -213,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}} @@ -221,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}} @@ -229,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}} @@ -237,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}} @@ -245,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' }}