fix pre-push to compare with main on first push #2605
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
johnduffell
changed the title
johnduffell
commented
Dec 18, 2024
| @@ -1,13 +1,27 @@ | |||
| # Fetch the latest changes from the remote without merging | |||
There was a problem hiding this comment.
not sure if the AI comments were providing any value
AndreaDiotallevi
approved these changes
Dec 19, 2024
tjmw
reviewed
Dec 19, 2024
| echo "Changes detected in the 'cdk' folder. Running lint and test..." | ||
| pnpm --filter cdk lint && pnpm --filter cdk test | ||
| else | ||
| # something went wrong, maybe we haven't pushed our branch and are branching off main | ||
| # use main not origin/main as we don't care if others changed cdk dir |
There was a problem hiding this comment.
Do you maybe want to compare with the point you branched? This SO post has some info on how to do that: https://stackoverflow.com/questions/29810331/is-there-a-quick-way-to-git-diff-from-the-point-or-branch-origin
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.
Following on from #2546
I noticed it wasn't actually working, the pushes were still taking ages.
It turned out from looking at the output, the AI generated script was assuming there was always an upstream
origin/MY_BRANCH_NAMEbranch, but this isn't the case until you push it.This meant a chicken and egg situation where when you pushed your new branch, it would run the command, get a nonzero exit code (128), and therefore run the tests!
This PR changes it to try the
mainbranch, if the similarly named origin branch doesn't exist.Even trying main is not bulletproof, as you might have pulled CDK related updates to main and not merged them into your branch. Or you might have fetched them and merged them in to your branch, without updating the
mainbranch. But I think this should cover most of our typical use cases in the way that we would expect.Testing
I have tested both of a new branch and an extra push, on both of with and without changes in the CDK folder, and all combinations work as expected.