Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add more check for PR's merged during release #1447

Merged
merged 1 commit into from
Nov 13, 2024

Conversation

MarekMichali
Copy link
Contributor

@MarekMichali MarekMichali commented Nov 13, 2024

Description

This checks if a PR has been merged after the first PR merge check and before the bumps are merged.
This checks also if a PR has been merged after the second PR merge check and before the draft release and tag are created.
This covers the corner case scenario where there is about a ~1 s window in the whole release where we could merge a PR and not detect it when needed.

Related issue(s)

@kyma-bot kyma-bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cla: yes Indicates the PR's author has signed the CLA. labels Nov 13, 2024
Copy link

Add one of following labels

- kind/feature -> Use it when you want to submit a new feature

- kind/enhancement -> Use it when you modify or improve an existing feature

- kind/bug -> Use it when you fix a bug

@kyma-bot kyma-bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Nov 13, 2024
@MarekMichali
Copy link
Contributor Author

/kind enhancement

@kyma-bot kyma-bot added the kind/enhancement Categorizes issue or PR as related to modifying or improving an existing feature label Nov 13, 2024
@MarekMichali MarekMichali marked this pull request as ready for review November 13, 2024 13:08
@MarekMichali MarekMichali requested a review from a team as a code owner November 13, 2024 13:08
@kyma-bot kyma-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 13, 2024
@kyma-gopher-bot kyma-gopher-bot enabled auto-merge (squash) November 13, 2024 13:09
@@ -268,6 +268,16 @@ jobs:
echo "Step skipped"
fi

- name: Check if any PR have been merged before merging the bump PR
run: |
COMMIT_SHA=$(gh api repos/${{ env.KYMA_ENVIRONMENT_BROKER_REPO }}/commits -q '.[1].sha')
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this check the commit before the PR bump

@kyma-gopher-bot kyma-gopher-bot merged commit f07cec3 into kyma-project:main Nov 13, 2024
59 of 71 checks passed
@kyma-bot kyma-bot added the lgtm Looks good to me! label Nov 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla: yes Indicates the PR's author has signed the CLA. kind/enhancement Categorizes issue or PR as related to modifying or improving an existing feature lgtm Looks good to me! size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants