Skip to content

Commit

Permalink
ci: Cleanup for disabled Merge Queue / merge_group (#23187)
Browse files Browse the repository at this point in the history
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:
- #21424

But was only tested with `merge_group` which has since been reverted.
  • Loading branch information
notpeter authored Jan 15, 2025
1 parent 72f1b32 commit 61db8be
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ on:
pull_request:
branches:
- "**"
merge_group:

concurrency:
# Allow only one workflow per any non-`main` branch.
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ on:
push:
branches:
- main
merge_group:

jobs:
check_formatting:
Expand Down

0 comments on commit 61db8be

Please sign in to comment.