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.
This commit is contained in:
parent
72f1b32cc5
commit
61db8beea4
2 changed files with 1 additions and 2 deletions
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
|
@ -10,7 +10,6 @@ on:
|
||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- "**"
|
- "**"
|
||||||
merge_group:
|
|
||||||
|
|
||||||
concurrency:
|
concurrency:
|
||||||
# Allow only one workflow per any non-`main` branch.
|
# Allow only one workflow per any non-`main` branch.
|
||||||
|
@ -114,6 +113,7 @@ jobs:
|
||||||
script/generate-licenses /tmp/zed_licenses_output
|
script/generate-licenses /tmp/zed_licenses_output
|
||||||
|
|
||||||
- name: Check for new vulnerable dependencies
|
- name: Check for new vulnerable dependencies
|
||||||
|
if: github.event_name == 'pull_request'
|
||||||
uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4
|
uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4
|
||||||
with:
|
with:
|
||||||
license-check: false
|
license-check: false
|
||||||
|
|
1
.github/workflows/docs.yml
vendored
1
.github/workflows/docs.yml
vendored
|
@ -7,7 +7,6 @@ on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
merge_group:
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
check_formatting:
|
check_formatting:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue