From 1b88364dd8950f005125b5014b299d97709d5a9b Mon Sep 17 00:00:00 2001 From: Quentin Monnet Date: Mon, 13 Jan 2025 16:19:37 +0000 Subject: [PATCH] ci: Fix step condition, to fix docs publishing Operator precedence matters... "!github.event_name == 'merge_group'" is likely different from "github.event_name != 'merge_group'", and the condition to run the publish Action would fail to validate even on "push" events. Let's fix. Fixes: 5e61fce7a2db ("ci: For merge groups, add event type, skip publishing docs") Signed-off-by: Quentin Monnet --- .github/workflows/docs.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index e3ccb1d..393bd4c 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -90,18 +90,18 @@ jobs: cp -r ./design-docs/src/mdbook/book "${{ github.workspace }}/publish/design-docs" - name: "(Push) Setup Pages" - if: "${{ !github.event.pull_request && !github.event_name == 'merge_group' }}" + if: "${{ !github.event.pull_request && github.event_name != 'merge_group' }}" uses: "actions/configure-pages@v5" - name: "(Push) Upload design-docs" - if: "${{ !github.event.pull_request && !github.event_name == 'merge_group' }}" + if: "${{ !github.event.pull_request && github.event_name != 'merge_group' }}" uses: "actions/upload-pages-artifact@v3" with: # Upload design-docs build directory content path: 'publish/design-docs' - name: "(Push) Deploy to GitHub Pages" - if: "${{ !github.event.pull_request && !github.event_name == 'merge_group' }}" + if: "${{ !github.event.pull_request && github.event_name != 'merge_group' }}" id: "deployment" uses: "actions/deploy-pages@v4" env: