From 87b847af68270c5842af423a7f11bc901b8b5085 Mon Sep 17 00:00:00 2001 From: Luca Comellini Date: Mon, 16 Sep 2024 15:54:54 -0700 Subject: [PATCH] Skip workflow runs the right way --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/dependency-review.yml | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index ddad6873..2bbda759 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -30,7 +30,7 @@ jobs: contents: read # for actions/checkout to fetch code security-events: write # for github/codeql-action/autobuild to send a status report packages: read # required to fetch internal or private CodeQL packs - + if: ${{ github.event_name != 'merge_group' }} strategy: fail-fast: false matrix: diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 9745fd3e..c36a9f2b 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -16,15 +16,13 @@ permissions: jobs: dependency-review: + name: Dependency Review runs-on: ubuntu-22.04 permissions: contents: read # for actions/checkout pull-requests: write # for actions/dependency-review-action to post comments + if: ${{ github.event_name != 'merge_group' }} steps: - - name: Skip on Merge Group - run: exit 0 # Artifically flag as successful, as this is a required check for branch protection. - if: github.event_name == 'merge_group' - - name: Checkout Repository uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7