Skip to content

Commit

Permalink
github/workflows: use merge_group instead of push events.
Browse files Browse the repository at this point in the history
We're currently doing both which doubles the number of jobs we end up
running for commits on `master`.
  • Loading branch information
MikeMcQuaid committed Dec 10, 2024
1 parent eae8d1b commit abb330d
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 13 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/actionlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,13 @@ name: actionlint

on:
push:
branches:
- master
paths:
- '.github/workflows/*.ya?ml'
- '.github/actionlint.yaml'
pull_request:
paths:
- '.github/workflows/*.ya?ml'
- '.github/actionlint.yaml'
merge_group:

env:
HOMEBREW_DEVELOPER: 1
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ name: Docker

on:
pull_request:
push:
branches:
- master
merge_group:
release:
types:
Expand Down Expand Up @@ -75,7 +72,7 @@ jobs:
"homebrew/brew:latest"
)
fi
elif [[ "${GITHUB_EVENT_NAME}" == "push" &&
elif [[ "${GITHUB_EVENT_NAME}" == "merge_group" &&
"${GITHUB_REF}" == "refs/heads/master" &&
"${{ matrix.version }}" == "22.04" ]]; then
tags+=(
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
name: Documentation CI

on:
push:
branches:
- master
pull_request:
merge_group:

Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
name: CI

on:
push:
branches:
- master
pull_request:
merge_group:

Expand Down

0 comments on commit abb330d

Please sign in to comment.