[chore][workflow/changelog] Fix comparisons to main#2309
Merged
lmolkova merged 1 commit intoopen-telemetry:mainfrom May 29, 2025
Merged
[chore][workflow/changelog] Fix comparisons to main#2309lmolkova merged 1 commit intoopen-telemetry:mainfrom
lmolkova merged 1 commit intoopen-telemetry:mainfrom
Conversation
lmolkova
approved these changes
May 29, 2025
jherbage
pushed a commit
to jherbage/semantic-conventions
that referenced
this pull request
Jul 1, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changes
Changelog checks are failing on a recent PR with an error saying no changelog file has been added. The PR however has added a changelog file.
The error is occurring because the changelog workflow is comparing the PR's branch against
origin/maindirectly. When a branch is not up to date withmain, as is the case with the referenced PR, files added tomainthat aren't in the PR's branch show up as renamed ingit, rather than new files. The check then fails because no new files were detected.The solution here is to compare the PR's branch to the best common ancestor (
git merge-base) withorigin/main. This takes into account the branch being out of date and properly detects new files.Note that this change is simply being copied over from opentelemetry-collector and opentelemetry-collector-contrib
Merge requirement checklist
[chore]