github/workflows: use merge_group instead of push events.

We're currently doing both which doubles the number of jobs we end up
running for commits on `master`.
This commit is contained in:
Mike McQuaid 2024-12-10 17:19:20 +00:00
parent eae8d1b769
commit abb330d496
No known key found for this signature in database
4 changed files with 1 additions and 13 deletions

View File

@ -2,8 +2,6 @@ name: actionlint
on: on:
push: push:
branches:
- master
paths: paths:
- '.github/workflows/*.ya?ml' - '.github/workflows/*.ya?ml'
- '.github/actionlint.yaml' - '.github/actionlint.yaml'
@ -11,7 +9,6 @@ on:
paths: paths:
- '.github/workflows/*.ya?ml' - '.github/workflows/*.ya?ml'
- '.github/actionlint.yaml' - '.github/actionlint.yaml'
merge_group:
env: env:
HOMEBREW_DEVELOPER: 1 HOMEBREW_DEVELOPER: 1

View File

@ -2,9 +2,6 @@ name: Docker
on: on:
pull_request: pull_request:
push:
branches:
- master
merge_group: merge_group:
release: release:
types: types:
@ -75,7 +72,7 @@ jobs:
"homebrew/brew:latest" "homebrew/brew:latest"
) )
fi fi
elif [[ "${GITHUB_EVENT_NAME}" == "push" && elif [[ "${GITHUB_EVENT_NAME}" == "merge_group" &&
"${GITHUB_REF}" == "refs/heads/master" && "${GITHUB_REF}" == "refs/heads/master" &&
"${{ matrix.version }}" == "22.04" ]]; then "${{ matrix.version }}" == "22.04" ]]; then
tags+=( tags+=(

View File

@ -1,9 +1,6 @@
name: Documentation CI name: Documentation CI
on: on:
push:
branches:
- master
pull_request: pull_request:
merge_group: merge_group:

View File

@ -1,9 +1,6 @@
name: CI name: CI
on: on:
push:
branches:
- master
pull_request: pull_request:
merge_group: merge_group: