From 61db8beea4897d02c594b272758bed1263658216 Mon Sep 17 00:00:00 2001 From: Peter Tripp Date: Wed, 15 Jan 2025 12:27:16 -0500 Subject: [PATCH] ci: Cleanup for disabled Merge Queue / merge_group (#23187) Only run actions dependency-review-action if running in a PR action. This broke when run as part of action for commit on main and on a preview branch: - https://github.com/zed-industries/zed/actions/runs/12793068921/job/35664998296 - https://github.com/zed-industries/zed/actions/runs/12793045639 Originally introduced in: - https://github.com/zed-industries/zed/pull/21424 But was only tested with `merge_group` which has since been reverted. --- .github/workflows/ci.yml | 2 +- .github/workflows/docs.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b45836ecf48b20..2d7563cdb39ae7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,6 @@ on: pull_request: branches: - "**" - merge_group: concurrency: # Allow only one workflow per any non-`main` branch. @@ -114,6 +113,7 @@ jobs: script/generate-licenses /tmp/zed_licenses_output - name: Check for new vulnerable dependencies + if: github.event_name == 'pull_request' uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4 with: license-check: false diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index fedccfc03f9c4d..0870a55e60057c 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -7,7 +7,6 @@ on: push: branches: - main - merge_group: jobs: check_formatting: