From a65e9112148f94c345aa0f6fe9954f36a0007c6c Mon Sep 17 00:00:00 2001 From: Jonathan Ho Date: Sat, 9 Dec 2023 05:25:57 -0800 Subject: [PATCH] ci: add merge group event to site (#3277) --- .github/workflows/site.yml | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/.github/workflows/site.yml b/.github/workflows/site.yml index f697331af..bcda034be 100644 --- a/.github/workflows/site.yml +++ b/.github/workflows/site.yml @@ -8,24 +8,25 @@ on: push: branches: ['main'] paths: - - "website/**" - - ".github/workflows/site.yml" - - "jsdoc2md.json" - - "typedoc.json" - - "package.json" - - "packages/**" + - 'website/**' + - '.github/workflows/site.yml' + - 'jsdoc2md.json' + - 'typedoc.json' + - 'package.json' + - 'packages/**' pull_request: - branches: ["main"] + branches: ['main'] paths: - - "website/**" - - ".github/workflows/site.yml" - - "jsdoc2md.json" - - "typedoc.json" - - "package.json" - - "packages/**" + - 'website/**' + - '.github/workflows/site.yml' + - 'jsdoc2md.json' + - 'typedoc.json' + - 'package.json' + - 'packages/**' # Allows you to run this workflow manually from the Actions tab workflow_dispatch: + merge_group: permissions: contents: read @@ -88,7 +89,7 @@ jobs: url: ${{ steps.deployment.outputs.page_url }} runs-on: ubuntu-latest needs: build - if: github.event_name != 'pull_request' + if: github.event_name != 'pull_request' && github.event_name != 'merge_group' concurrency: deploy-site steps: - name: Deploy to GitHub Pages