mirror of
https://github.com/outbackdingo/firezone.git
synced 2026-01-27 10:18:54 +00:00
ci: run all jobs in merge queue (#10744)
Trying to be clever as to which jobs to run inside the merge queue doesn't seem to work. Therefore, we now revert to just running all jobs in there.
This commit is contained in:
17
.github/workflows/ci.yml
vendored
17
.github/workflows/ci.yml
vendored
@@ -47,6 +47,13 @@ jobs:
|
||||
exit 0;
|
||||
fi
|
||||
|
||||
# For merge group, run all jobs
|
||||
if [ "${{ github.event_name }}" = "merge_group" ]; then
|
||||
echo "jobs_to_run=$jobs" >> "$GITHUB_OUTPUT"
|
||||
|
||||
exit 0;
|
||||
fi
|
||||
|
||||
# Fetch base ref for PRs
|
||||
if [ "${{ github.event_name }}" = "pull_request" ]; then
|
||||
git fetch origin ${{ github.base_ref }} --depth=1
|
||||
@@ -56,16 +63,6 @@ jobs:
|
||||
cat changed_files.txt
|
||||
fi
|
||||
|
||||
# Fetch base ref for merge_group
|
||||
if [ "${{ github.event_name }}" = "merge_group" ]; then
|
||||
# Base ref could be a few commits away, so fetch a few commits in case the queue is long
|
||||
git fetch origin ${{ github.event.merge_group.base_ref }} --depth=20
|
||||
git diff --name-only ${{ github.event.merge_group.base_ref }} ${{ github.sha }} > changed_files.txt
|
||||
|
||||
echo "Changed files:"
|
||||
cat changed_files.txt
|
||||
fi
|
||||
|
||||
# Run all jobs if CI configuration changes
|
||||
if grep -q '^\.github/' changed_files.txt; then
|
||||
echo "jobs_to_run=$jobs" >> "$GITHUB_OUTPUT"
|
||||
|
||||
Reference in New Issue
Block a user