fix(ci): When checking number of commits in release summary, only include cq-bot commits#11299
Merged
kodiakhq[bot] merged 2 commits intocloudquery:mainfrom Jun 8, 2023
Conversation
…lude cq-bot commits
erezrokah
commented
Jun 6, 2023
erezrokah
force-pushed
the
chore/fix_release_summary_condition
branch
from
7b76eab to
ec3cb70
Compare
erezrokah
requested review from
candiduslynx
and removed request for
hermanschaaf and
yevgenypats
candiduslynx
approved these changes
Jun 8, 2023
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
3 participants
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.
Summary
To avoid a recursive workflow when adding the release summary to release PRs, we check that the number of commits is 1, and only then run the release summary workflow.
The issue is that sometimes Kodiak's is faster than our CI, and does a merge with main commit before we manage to add the summary commit, hence it never gets added.
This PR improves the CI by filtering out commits to only include
cq-botcommits, so Kodiak commits are ignored.See example PR where this race condition happened:
#11139
https://github.com/cloudquery/cloudquery/pull/11139/commits
https://github.com/cloudquery/cloudquery/actions/runs/5192224428/jobs/9361094081