diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index a6a48ba07..c7761fad9 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -1,6 +1,6 @@ name: Run tests with coverage env: - version: 10.0.0 + version: 10.0.2 on: push: @@ -10,6 +10,7 @@ on: types: [opened, synchronize, reopened, ready_for_review] branches: - 'master' + merge_group: jobs: diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index e3caa03c4..6c647deaf 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -1,18 +1,20 @@ name: Integration test env: - version: 10.0.0 + version: 10.0.2 on: - push: + pull_request: branches: - 'master' + merge_group: workflow_dispatch: jobs: Integration-test: + if: github.event_name != 'pull_request' runs-on: ubuntu-22.04 strategy: fail-fast: true @@ -43,6 +45,7 @@ jobs: run: pytest -nauto Windows-test: + if: github.event_name != 'pull_request' env: SCIPOPTDIR: C:\scipoptdir runs-on: windows-latest @@ -85,6 +88,7 @@ jobs: run: pytest -nauto MacOS-test: + if: github.event_name != 'pull_request' runs-on: macos-latest strategy: matrix: @@ -128,6 +132,18 @@ jobs: # export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${{ github.workspace }}/scipoptsuite/lib # pytest + integration-gate: + if: always() + needs: [Integration-test, Windows-test, MacOS-test] + runs-on: ubuntu-latest + steps: + - name: Check integration test results + run: | + echo "Results: ${{ join(needs.*.result, ', ') }}" + if ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}; then + exit 1 + fi + ### if you need valgrind on mac, you can install it via # brew tap LouisBrunner/valgrind # brew install --HEAD LouisBrunner/valgrind/valgrind diff --git a/.github/workflows/stubs.yml b/.github/workflows/stubs.yml index 79577b414..339359089 100644 --- a/.github/workflows/stubs.yml +++ b/.github/workflows/stubs.yml @@ -1,6 +1,6 @@ name: Check type stubs env: - version: 10.0.0 + version: 10.0.2 on: push: diff --git a/.github/workflows/test-release.yml b/.github/workflows/test-release.yml index e837cac4f..d6ce12c9e 100644 --- a/.github/workflows/test-release.yml +++ b/.github/workflows/test-release.yml @@ -1,7 +1,7 @@ name: TestPyPI release env: - version: 10.0.0 + version: 10.0.2 # runs only when a release is published, not on drafts diff --git a/.github/workflows/update-packages-and-documentation.yml b/.github/workflows/update-packages-and-documentation.yml index 6d518c25f..32eea43e0 100644 --- a/.github/workflows/update-packages-and-documentation.yml +++ b/.github/workflows/update-packages-and-documentation.yml @@ -1,7 +1,7 @@ name: Test and Release PyPI Package env: - version: 10.0.0 + version: 10.0.2 # runs only when a release is published, not on drafts @@ -38,7 +38,7 @@ jobs: - name: Install dependencies (SCIPOptSuite) run: | - wget --quiet --no-check-certificate https://github.com/scipopt/scip/releases/download/$(echo "v${{env.version}}" | tr -d '.')/scipoptsuite_${{ env.version }}-1+jammy_amd64.deb + wget --quiet --no-check-certificate https://github.com/scipopt/scip/releases/download/v${{ env.version }}/scipoptsuite_${{ env.version }}-1+jammy_amd64.deb sudo apt-get update && sudo apt install -y ./scipoptsuite_${{ env.version }}-1+jammy_amd64.deb - name: Setup python ${{ matrix.python-version }} @@ -109,7 +109,7 @@ jobs: - name: Install dependencies (SCIPOptSuite) run: | - wget --quiet --no-check-certificate https://github.com/scipopt/scip/releases/download/$(echo "v${{env.version}}" | tr -d '.')/scipoptsuite_${{ env.version }}-1+jammy_amd64.deb + wget --quiet --no-check-certificate https://github.com/scipopt/scip/releases/download/v${{ env.version }}/scipoptsuite_${{ env.version }}-1+jammy_amd64.deb sudo apt-get update && sudo apt install -y ./scipoptsuite_${{ env.version }}-1+jammy_amd64.deb - name: Setup python 3 diff --git a/CHANGELOG.md b/CHANGELOG.md index e1a524e7c..a8e633755 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ - Replace Python math with C-level math functions and refactor unary expressions (#1224) - Speed up `ProdExpr.__neg__` and `Constant.__neg__` via C-level API (#1250) - Extended `structured_optimization_trace` recipe to support context-managed JSONL tracing with final `run_end` records, alongside the existing attach-style in-memory tracing. +- Integration tests now run in the merge queue before merging instead of after pushing to `master` (#1249) ### Removed - `SumExpr`.coefs has been removed; its values were always 1.0 (#1258)