Update auto-merge action to use bash script #3595
Merged
Conversation
This file contains 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
Signed-off-by: Ankita Katiyar <ankitakatiyar2401@gmail.com>
Signed-off-by: Ankita Katiyar <ankitakatiyar2401@gmail.com>
astrojuanlu
reviewed
Feb 5, 2024
| echo "PR ${pr} mergeable: ${mergeable}" | ||
| mergeable_state=$(echo "${response}" | tr '\r\n' ' ' | jq --raw-output ".mergeable_state // \"unknown\"") | ||
| echo "PR ${pr} mergeable_state: ${mergeable_state}" | ||
| [ "${mergeable}" == true ] && [[ " ${VALID_MERGEABLE_STATES[@]} " =~ " ${mergeable_state} " ]] |
There was a problem hiding this comment.
Shellcheck complains about this line:
$ shellcheck myscript
[Line 44:](javascript:setPosition(44, 36))
[ "${mergeable}" == true ] && [[ " ${VALID_MERGEABLE_STATES[@]} " =~ " ${mergeable_state} " ]]
^-- [SC2199](https://www.shellcheck.net/wiki/SC2199) (error): Arrays implicitly concatenate in [[ ]]. Use a loop (or explicit * instead of @).
>> ^-- [SC2076](https://www.shellcheck.net/wiki/SC2076) (warning): Remove quotes from right-hand side of =~ to match as a regex rather than literally.
SajidAlamQB
approved these changes
Feb 5, 2024
There was a problem hiding this comment.
Happy to go back to using the old script for this, thank you @ankatiyar!
merelcht
approved these changes
Feb 5, 2024
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.
Description
Related #3588
The auto-merge action from the marketplace was unable to get around the "Squash merge" requirement which can only be set on repo level but not branch level.
Development notes
This PR is to update the action to go back to the bash script we were using before with CircleCI - https://github.com/kedro-org/kedro/blob/0.18.14/tools/circleci/github_scripts/attempt_merge_pr.sh
I've been able to make this work on my fork -
We also don't need the "labeler" action anymore since the script only merges PRs on
merge-main-to-developbranch.Will need to keep an eye on the action for permission issues once it is merged - https://www.designcise.com/web/tutorial/how-to-fix-github-action-permission-denied-error-when-executing-a-file
Checklist
RELEASE.mdfile