Fix merge queue (#2127)
This commit is contained in:
parent
379d13f881
commit
be3d743cfc
|
|
@ -2,6 +2,8 @@ name: Build System Check
|
|||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
paths:
|
||||
- 'Makefile'
|
||||
- 'dependencies.Dockerfile'
|
||||
|
|
|
|||
|
|
@ -24,8 +24,6 @@ jobs:
|
|||
!contains(github.event.pull_request.labels.*.name, 'Skip Changelog') &&
|
||||
!contains(github.event.pull_request.title, '[chore]')
|
||||
}}
|
||||
env:
|
||||
PR_HEAD: ${{ github.event.pull_request.head.sha }}
|
||||
steps:
|
||||
- name: Checkout Repo
|
||||
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
|
||||
|
|
@ -46,7 +44,7 @@ jobs:
|
|||
|
||||
- name: Ensure no changes to the CHANGELOG.md
|
||||
run: |
|
||||
if [[ $(git diff --name-only $(git merge-base origin/main $PR_HEAD) $PR_HEAD ./CHANGELOG*.md) ]]
|
||||
if [[ $(git diff --name-only origin/main HEAD ./CHANGELOG*.md) ]]
|
||||
then
|
||||
echo "CHANGELOG.md should not be directly modified."
|
||||
echo "Please add a .yaml file to the ./.chloggen/ directory."
|
||||
|
|
@ -59,7 +57,7 @@ jobs:
|
|||
|
||||
- name: Ensure ./.chloggen/*.yaml addition(s)
|
||||
run: |
|
||||
if [[ 1 -gt $(git diff --diff-filter=A --name-only $(git merge-base origin/main $PR_HEAD) $PR_HEAD ./.chloggen | grep -c \\.yaml) ]]
|
||||
if [[ 1 -gt $(git diff --diff-filter=A --name-only origin/main HEAD ./.chloggen | grep -c \\.yaml) ]]
|
||||
then
|
||||
echo "No changelog entry was added to the ./.chloggen/ directory."
|
||||
echo "Please add a .yaml file to the ./.chloggen/ directory."
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@ name: Checks
|
|||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
pull_request:
|
||||
merge_group:
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
name: 'Generate registry area labels'
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
branches:
|
||||
- main
|
||||
paths:
|
||||
- model/**
|
||||
- ./.github/workflows/generate-registry-area-labels.yml
|
||||
|
|
|
|||
Loading…
Reference in New Issue