From 0ecf2e7ebd7cdec02fdf08ce3a11b9ce30aff830 Mon Sep 17 00:00:00 2001 From: snider Date: Mon, 6 Oct 2025 19:50:49 +0100 Subject: [PATCH] Simplify conditional checks in GitHub Actions workflow for build jobs --- .github/workflows/_on-pr.yml | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/.github/workflows/_on-pr.yml b/.github/workflows/_on-pr.yml index 82bb74df..0d7aca87 100644 --- a/.github/workflows/_on-pr.yml +++ b/.github/workflows/_on-pr.yml @@ -39,9 +39,7 @@ jobs: build-linux-intel: name: Chain - if: | - (github.actor == 'Snider' && github.event.pull_request.user.login == 'Snider') || - (github.event.review.state == 'approved' && !github.event.pull_request.draft) + if: ${{!github.event.pull_request.draft}} uses: ./.github/workflows/build-linux-intel.yml secrets: inherit with: @@ -49,9 +47,7 @@ jobs: build-linux-arm: name: Chain - if: | - (github.actor == 'Snider' && github.event.pull_request.user.login == 'Snider') || - (github.event.review.state == 'approved' && !github.event.pull_request.draft) + if: ${{!github.event.pull_request.draft}} uses: ./.github/workflows/build-linux-arm64.yml secrets: inherit with: @@ -59,9 +55,7 @@ jobs: build-windows-intel: name: Chain - if: | - (github.actor == 'Snider' && github.event.pull_request.user.login == 'Snider') || - (github.event.review.state == 'approved' && !github.event.pull_request.draft) + if: ${{!github.event.pull_request.draft}} uses: ./.github/workflows/build-windows-intel.yml secrets: inherit with: @@ -69,9 +63,7 @@ jobs: build-macos-arm64: name: Chain - if: | - (github.actor == 'Snider' && github.event.pull_request.user.login == 'Snider') || - (github.event.review.state == 'approved' && !github.event.pull_request.draft) + if: ${{!github.event.pull_request.draft}} uses: ./.github/workflows/build-macos-arm64.yml secrets: inherit with: @@ -79,9 +71,7 @@ jobs: build-macos-intel: name: Chain - if: | - (github.actor == 'Snider' && github.event.pull_request.user.login == 'Snider') || - (github.event.review.state == 'approved' && !github.event.pull_request.draft) + if: ${{!github.event.pull_request.draft}} uses: ./.github/workflows/build-macos-intel.yml secrets: inherit with: @@ -89,9 +79,7 @@ jobs: build-docker: name: Docker - if: | - (github.actor == 'Snider' && github.event.pull_request.user.login == 'Snider') || - (github.event.review.state == 'approved' && !github.event.pull_request.draft) + if: ${{!github.event.pull_request.draft}} uses: ./.github/workflows/build-docker.yml secrets: inherit with: @@ -99,7 +87,5 @@ jobs: build-docs: name: Docs - if: | - (github.actor == 'Snider' && github.event.pull_request.user.login == 'Snider') || - (github.event.review.state == 'approved' && !github.event.pull_request.draft) + if: ${{!github.event.pull_request.draft}} uses: ./.github/workflows/build-docs.yml