Add push git tools #29
Open
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
raipatti
commented
Mar 22, 2024
raipatti
commented
- Assert sync
- Push production
- Push staging
- Assert sync - Push production - Push staging
esamattis
reviewed
Mar 22, 2024
| echo "You can deploy to production only from the local master branch" | ||
| exit 1 | ||
| fi | ||
|
|
There was a problem hiding this comment.
Uncommitted changes are not deployed. Usually it is not intentional to leave changes not deployed. If user really wants this they can manually stash them.
Suggested change
| if [ "$(git status --porcelain)" != "" ]; then | |
| echo "Dirty. Commit changes before deploy" | |
| exit 1 | |
| fi | |
Comment on lines
+8
to
+13
| git push origin $branch:$branch | ||
| if [ "$(git rev-parse HEAD)" != "$(git rev-parse origin/$branch)" ]; then | ||
| echo "You local git is not sync with the remote origin/$branch" | ||
| echo "Ensure it is synced with: git pull origin && git push origin" | ||
| exit 1 | ||
| fi |
There was a problem hiding this comment.
Looks off. After push it is alway sync and the assert cannot ever fail
I'd consider adding a dirty check here too since uncommitted changes cannot be in "sync".
Suggested change
| git push origin $branch:$branch | |
| if [ "$(git rev-parse HEAD)" != "$(git rev-parse origin/$branch)" ]; then | |
| echo "You local git is not sync with the remote origin/$branch" | |
| echo "Ensure it is synced with: git pull origin && git push origin" | |
| exit 1 | |
| fi | |
| if [ "$(git status --porcelain)" != "" ]; then | |
| echo "Dirty git." | |
| exit 1 | |
| fi | |
| if [ "$(git rev-parse HEAD)" != "$(git rev-parse origin/$branch)" ]; then | |
| echo "You local git is not sync with the remote origin/$branch" | |
| echo "Ensure it is synced with: git pull origin && git push origin" | |
| exit 1 | |
| fi |
There was a problem hiding this comment.
also mutating the origin in an "assert" is bit surprising
| set -o pipefail | ||
|
|
||
| if [ "$(git rev-parse --abbrev-ref HEAD)" != "master" ]; then | ||
| echo "You can deploy to production only from the local master branch" |
There was a problem hiding this comment.
nit: Usually error messages (this and others) should be logged to stderr so piping would not hide them. We probably won't be piping these probably does not matter.
Suggested change
| echo "You can deploy to production only from the local master branch" | |
| >&2 echo "You can deploy to production only from the local master branch" |
|
|
||
| # find out on which branch were are on | ||
| branch="$(git rev-parse --abbrev-ref HEAD)" | ||
|
|
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.