Skip to content

Commit 77d09e1

Browse files
Attempt to merge changes from heroku before pushing new version (#4)
Why: When trying to push changes to heroku, sometimes it gets stuck because there are some changes made from someone else besides this action which means that it needs to merge those changes to the branch its trying to push. We only want to manage deploys via this action so there's no need to be careful when pushing changes to heroku. This addresses the issue by: - Adding --force to git push so it is always able to deploy.
1 parent dc668ba commit 77d09e1

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- uses: actions/checkout@v1
3434
with:
3535
ref: master # you can use this to get a non-detached head but it's not strictly required
36-
- uses: ilkka/git-https-push-action@master
36+
- uses: utrustdev/git-https-push-action@master
3737
name: Deploy
3838
with:
3939
remoteUrl: ${{ secrets.PUSH_REMOTE }}

entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ fi
2020

2121
git config --global --add safe.directory /github/workspace
2222
git remote add $REMOTE $REMOTE_URL
23-
git push $(join_by " " $EXTRA_ARGS) $REMOTE HEAD:master
23+
git push --force $(join_by " " $EXTRA_ARGS) $REMOTE HEAD:master

0 commit comments

Comments
 (0)