From 7878d22e46f7498cb188e8b33bb1e013db60e90c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Jul 2025 10:22:35 +0000 Subject: [PATCH 1/6] =?UTF-8?q?=E2=AC=86=EF=B8=8F=F0=9F=91=A8=E2=80=8D?= =?UTF-8?q?=F0=9F=92=BB=20Update=20munich-quantum-toolkit/workflows=20acti?= =?UTF-8?q?on=20to=20v1.14?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/cd.yml | 2 +- .github/workflows/ci.yml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 211c3b18d..4be8c3056 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -10,7 +10,7 @@ on: jobs: python-packaging: name: 🐍 Packaging - uses: munich-quantum-toolkit/workflows/.github/workflows/reusable-python-packaging.yml@v1.10 + uses: munich-quantum-toolkit/workflows/.github/workflows/reusable-python-packaging.yml@v1.14 with: pure-python: true diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a9b549ad1..d29f99405 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,19 +14,19 @@ concurrency: jobs: change-detection: name: 🔍 Change - uses: munich-quantum-toolkit/workflows/.github/workflows/reusable-change-detection.yml@v1.10 + uses: munich-quantum-toolkit/workflows/.github/workflows/reusable-change-detection.yml@v1.14 python-linter: name: 🐍 Lint needs: change-detection if: fromJSON(needs.change-detection.outputs.run-python-tests) - uses: munich-quantum-toolkit/workflows/.github/workflows/reusable-python-linter.yml@v1.10 + uses: munich-quantum-toolkit/workflows/.github/workflows/reusable-python-linter.yml@v1.14 python-tests: name: 🐍 Test needs: change-detection if: fromJSON(needs.change-detection.outputs.run-python-tests) - uses: munich-quantum-toolkit/workflows/.github/workflows/reusable-python-ci.yml@v1.10 + uses: munich-quantum-toolkit/workflows/.github/workflows/reusable-python-ci.yml@v1.14 with: enable-ubuntu2404: true enable-ubuntu2404-arm: false # not supported by BQSKit @@ -41,13 +41,13 @@ jobs: name: 📝 CodeQL needs: change-detection if: fromJSON(needs.change-detection.outputs.run-code-ql) - uses: munich-quantum-toolkit/workflows/.github/workflows/reusable-code-ql-python.yml@v1.10 + uses: munich-quantum-toolkit/workflows/.github/workflows/reusable-code-ql-python.yml@v1.14 cd: name: 🚀 CD needs: change-detection if: fromJSON(needs.change-detection.outputs.run-cd) - uses: munich-quantum-toolkit/workflows/.github/workflows/reusable-python-packaging.yml@v1.10 + uses: munich-quantum-toolkit/workflows/.github/workflows/reusable-python-packaging.yml@v1.14 with: pure-python: true From bde99fbeb12369af7302953431466e687f3e6c6d Mon Sep 17 00:00:00 2001 From: Daniel Haag Date: Thu, 17 Jul 2025 15:08:21 +0200 Subject: [PATCH 2/6] Update to new workflows --- .github/workflows/cd.yml | 12 ++++++----- .github/workflows/ci.yml | 45 +++++++++++++++++++++++++++------------- 2 files changed, 38 insertions(+), 19 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 4be8c3056..f14caa792 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -8,11 +8,13 @@ on: - .github/workflows/cd.yml jobs: - python-packaging: + build-sdist: name: 🐍 Packaging - uses: munich-quantum-toolkit/workflows/.github/workflows/reusable-python-packaging.yml@v1.14 - with: - pure-python: true + uses: munich-quantum-toolkit/workflows/.github/workflows/reusable-python-packaging-sdist.yml@v1.14 + + build-wheel: + name: 🐍 Packaging + uses: munich-quantum-toolkit/workflows/.github/workflows/reusable-python-packaging-wheel-build.yml@v1.14 deploy: if: github.event_name == 'release' && github.event.action == 'published' @@ -25,7 +27,7 @@ jobs: id-token: write attestations: write contents: read - needs: [python-packaging] + needs: [build-sdist, build-wheel] steps: - uses: actions/download-artifact@v4 with: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d29f99405..4d113023f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,18 +21,25 @@ jobs: needs: change-detection if: fromJSON(needs.change-detection.outputs.run-python-tests) uses: munich-quantum-toolkit/workflows/.github/workflows/reusable-python-linter.yml@v1.14 - + python-tests: name: 🐍 Test needs: change-detection - if: fromJSON(needs.change-detection.outputs.run-python-tests) - uses: munich-quantum-toolkit/workflows/.github/workflows/reusable-python-ci.yml@v1.14 + if: fromJSON(needs.change-detection.outputs.run-python-tests) && !contains(github.event.pull_request.labels.*.name, 'extensive-python-ci') + strategy: + fail-fast: false + matrix: + runs-on: + [ubuntu-24.04, macos-13, macos-14, windows-2022] + uses: munich-quantum-toolkit/workflows/.github/workflows/reusable-python-tests.yml@v1.14 with: - enable-ubuntu2404: true - enable-ubuntu2404-arm: false # not supported by BQSKit - enable-macos13: true - enable-macos14: true - enable-windows2022: true + runs-on: ${{ matrix.runs-on }} + + python-coverage: + name: 🐍 Coverage + needs: [change-detection, python-tests] + if: fromJSON(needs.change-detection.outputs.run-python-tests) && ${{ always() && !failure() && !cancelled() }} + uses: munich-quantum-toolkit/workflows/.github/workflows/reusable-python-coverage.yml@v1.14 permissions: contents: read id-token: write @@ -43,13 +50,17 @@ jobs: if: fromJSON(needs.change-detection.outputs.run-code-ql) uses: munich-quantum-toolkit/workflows/.github/workflows/reusable-code-ql-python.yml@v1.14 - cd: + build-sdist: name: 🚀 CD needs: change-detection if: fromJSON(needs.change-detection.outputs.run-cd) - uses: munich-quantum-toolkit/workflows/.github/workflows/reusable-python-packaging.yml@v1.14 - with: - pure-python: true + uses: munich-quantum-toolkit/workflows/.github/workflows/reusable-python-packaging-sdist.yml@v1.14 + + build-wheel: + name: 🚀 CD + needs: change-detection + if: fromJSON(needs.change-detection.outputs.run-cd) + uses: munich-quantum-toolkit/workflows/.github/workflows/reusable-python-packaging-wheel-build.yml@v1.14 required-checks-pass: # This job does nothing and is only used for branch protection name: 🚦 Check @@ -58,8 +69,10 @@ jobs: - change-detection - python-linter - python-tests - - cd + - python-coverage - code-ql + - build-sdist + - build-wheel runs-on: ubuntu-latest steps: - name: Decide whether the needed jobs succeeded or failed @@ -74,12 +87,16 @@ jobs: fromJSON(needs.change-detection.outputs.run-python-tests) && '' || 'python-tests,' }} + ${{ + fromJSON(needs.change-detection.outputs.run-python-tests) + && '' || 'python-coverage,' + }} ${{ fromJSON(needs.change-detection.outputs.run-code-ql) && '' || 'code-ql,' }} ${{ fromJSON(needs.change-detection.outputs.run-cd) - && '' || 'cd,' + && '' || 'build-sdist,build-wheel,' }} jobs: ${{ toJSON(needs) }} From 9200b2aadd9cddd3ce9c2ae1969f138424e2ff3e Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 17 Jul 2025 13:08:36 +0000 Subject: [PATCH 3/6] =?UTF-8?q?=F0=9F=8E=A8=20pre-commit=20fixes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4d113023f..c58fb243d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: needs: change-detection if: fromJSON(needs.change-detection.outputs.run-python-tests) uses: munich-quantum-toolkit/workflows/.github/workflows/reusable-python-linter.yml@v1.14 - + python-tests: name: 🐍 Test needs: change-detection @@ -29,12 +29,11 @@ jobs: strategy: fail-fast: false matrix: - runs-on: - [ubuntu-24.04, macos-13, macos-14, windows-2022] + runs-on: [ubuntu-24.04, macos-13, macos-14, windows-2022] uses: munich-quantum-toolkit/workflows/.github/workflows/reusable-python-tests.yml@v1.14 with: runs-on: ${{ matrix.runs-on }} - + python-coverage: name: 🐍 Coverage needs: [change-detection, python-tests] From febf350833ce516f332561c9d5126d883bc9aad8 Mon Sep 17 00:00:00 2001 From: Daniel Haag Date: Thu, 17 Jul 2025 15:47:12 +0200 Subject: [PATCH 4/6] Remove mentioning of extensive label --- .github/workflows/ci.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c58fb243d..ea11b025b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: python-tests: name: 🐍 Test needs: change-detection - if: fromJSON(needs.change-detection.outputs.run-python-tests) && !contains(github.event.pull_request.labels.*.name, 'extensive-python-ci') + if: fromJSON(needs.change-detection.outputs.run-python-tests) strategy: fail-fast: false matrix: @@ -80,15 +80,7 @@ jobs: allowed-skips: >- ${{ fromJSON(needs.change-detection.outputs.run-python-tests) - && '' || 'python-linter,' - }} - ${{ - fromJSON(needs.change-detection.outputs.run-python-tests) - && '' || 'python-tests,' - }} - ${{ - fromJSON(needs.change-detection.outputs.run-python-tests) - && '' || 'python-coverage,' + && '' || 'python-linter,python-tests,python-coverage,' }} ${{ fromJSON(needs.change-detection.outputs.run-code-ql) From b5c7a6767af5da4cc7f1d0638aaec4cbc2d0640e Mon Sep 17 00:00:00 2001 From: Daniel Haag Date: Thu, 17 Jul 2025 18:27:49 +0200 Subject: [PATCH 5/6] Fix condition for Python coverage --- .github/workflows/ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ea11b025b..a4f10e3ad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: python-coverage: name: 🐍 Coverage needs: [change-detection, python-tests] - if: fromJSON(needs.change-detection.outputs.run-python-tests) && ${{ always() && !failure() && !cancelled() }} + if: fromJSON(needs.change-detection.outputs.run-python-tests) uses: munich-quantum-toolkit/workflows/.github/workflows/reusable-python-coverage.yml@v1.14 permissions: contents: read @@ -60,8 +60,9 @@ jobs: needs: change-detection if: fromJSON(needs.change-detection.outputs.run-cd) uses: munich-quantum-toolkit/workflows/.github/workflows/reusable-python-packaging-wheel-build.yml@v1.14 - - required-checks-pass: # This job does nothing and is only used for branch protection + + # this job does nothing and is only used for branch protection + required-checks-pass: name: 🚦 Check if: always() needs: From 9ec95f73e93468e83a33badef03f28c0f50c0875 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 17 Jul 2025 16:28:08 +0000 Subject: [PATCH 6/6] =?UTF-8?q?=F0=9F=8E=A8=20pre-commit=20fixes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a4f10e3ad..5b0ff5a77 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,7 +60,7 @@ jobs: needs: change-detection if: fromJSON(needs.change-detection.outputs.run-cd) uses: munich-quantum-toolkit/workflows/.github/workflows/reusable-python-packaging-wheel-build.yml@v1.14 - + # this job does nothing and is only used for branch protection required-checks-pass: name: 🚦 Check