Skip to content

Commit 3b8ffd2

Browse files
dmitryaxrite7sh
authored andcommitted
[chore] Move chloggen config staleness check out of changelog job (open-telemetry#46737)
The `generate-chloggen-components` check was living in the `changelog` job, which is skipped for PRs with the `Skip Changelog` label. This meant auto-generated PRs could merge with a stale `.chloggen/config.yaml`, causing the next unrelated PR to fail the check. Move the check to the `checks` job in `build-and-test.yml`, which runs unconditionally on all PRs and merge queue entries. Mirrors open-telemetry/opentelemetry-collector#14726
1 parent 01d0248 commit 3b8ffd2

2 files changed

Lines changed: 4 additions & 11 deletions

File tree

.github/workflows/build-and-test.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,10 @@ jobs:
187187
run: |
188188
make generate-schemas
189189
git diff --exit-code '*.schema.yaml' || (echo 'Config schemas are out of date, please run "make generate-schemas" and commit the changes in this PR.' && exit 1)
190+
- name: generate-chloggen-components
191+
run: |
192+
make generate-chloggen-components
193+
git diff --exit-code || (echo '.chloggen/config.yaml is out of date, please run "make generate-chloggen-components" and commit the changes.' && exit 1)
190194
unittest-matrix:
191195
strategy:
192196
fail-fast: false

.github/workflows/changelog.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,6 @@ jobs:
5454
echo "CHANGELOG.md and CHANGELOG-API.md were not modified."
5555
fi
5656
57-
- name: Ensure changelog config.yaml is up to date
58-
if: ${{ !contains(github.event.pull_request.labels.*.name, 'dependencies') && !contains(github.event.pull_request.labels.*.name, 'Skip Changelog')}}
59-
run: |
60-
make generate-chloggen-components
61-
if [[ $(git diff --name-only) ]]; then
62-
echo ".chloggen/config.yaml is out of date. Please run 'make generate-chloggen-components' and commit the changes."
63-
false
64-
else
65-
echo ".chloggen/config.yaml is up to date."
66-
fi
67-
6857
- name: Ensure ./.chloggen/*.yaml addition(s)
6958
if: ${{ !contains(github.event.pull_request.labels.*.name, 'dependencies') && !contains(github.event.pull_request.labels.*.name, 'Skip Changelog') && !contains(github.event.pull_request.title, '[chore]')}}
7059
run: |

0 commit comments

Comments
 (0)