fix: Modified auto merge condition #1136
Merged
Conversation
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
…on-pnpmUpdate-394
ZhongpinWang
requested changes
Sep 30, 2025
.github/workflows/pnpm-update.yml
Outdated
| } | ||
| if (!allAcceptable) { | ||
| throw new Error(`PR #${pr.number} has failed checks that prevent merging.`); |
There was a problem hiding this comment.
[req] In such case, retry won't change anything right? We can already return something like 'failed' here and let the workflow finish.
There was a problem hiding this comment.
Log an error here. Don't throw. Throw will immediately jump out of the function and it will never reach the return.
ZhongpinWang
reviewed
Oct 1, 2025
.github/workflows/pnpm-update.yml
Outdated
| } | ||
| if (!allAcceptable) { | ||
| throw new Error(`PR #${pr.number} has failed checks that prevent merging.`); |
There was a problem hiding this comment.
Log an error here. Don't throw. Throw will immediately jump out of the function and it will never reach the return.
.github/workflows/pnpm-update.yml
Outdated
| git config --global user.email "[email protected]" | ||
| git config --global user.name "cloud-sdk-js" | ||
| git checkout -b "bot/monthly-transitive-dependency-update-$(date +%Y-%m-%d)" | ||
| BRANCH_NAME="bot/monthly-transitive-dependency-update-$(date -u +%Y-%m-%d-%H%M%S)" |
There was a problem hiding this comment.
Suggested change
| BRANCH_NAME="bot/monthly-transitive-dependency-update-$(date -u +%Y-%m-%d-%H%M%S)" | |
| BRANCH_NAME="bot/monthly-transitive-dependency-update-$(date -u +%Y%m%d-%H%M%S)" |
.github/workflows/pnpm-update.yml
Outdated
| github-token: ${{ secrets.GH_CLOUD_SDK_JS_ADMIN_WRITE_TOKEN }} | ||
| script: | | ||
| const { repo, owner } = context.repo; | ||
| const branch = `bot/monthly-transitive-dependency-update-${new Date().toISOString().split('T')[0]}`; |
There was a problem hiding this comment.
Now we changed the branch name and included H M S, we should probably also change this line or?
ZhongpinWang
reviewed
Oct 1, 2025
…-sdk-js into githAction-pnpmUpdate-394
ZhongpinWang
approved these changes
Oct 20, 2025
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.
Fixed auto merge condition and changed settimeout to https://www.npmjs.com/package/async-retry
library.