Skip to content

Commit

Permalink
fix(push-workflows): Check stash before pop
Browse files Browse the repository at this point in the history
  • Loading branch information
RasmusSkytte committed Feb 21, 2024
1 parent dfcf34f commit 97b19dc
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/document.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
git remote set-url origin https://$GITHUB_ACTOR:${{ secrets.GH_PAT }}@github.com/$GITHUB_REPOSITORY.git
git stash
git pull --rebase origin ${{ inputs.branch_name }}
git stash pop
git stash list | grep stash@{0} && git stash pop || echo "No stash to pop"
git add man/\* NAMESPACE DESCRIPTION
git commit -m "docs: update documentation" || echo "No changes to commit"
git push origin ${{ inputs.branch_name }}
2 changes: 1 addition & 1 deletion .github/workflows/render-readme.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,6 @@ jobs:
git remote set-url origin https://$GITHUB_ACTOR:${{ secrets.GH_PAT }}@github.com/$GITHUB_REPOSITORY.git
git stash
git pull --rebase origin ${{ inputs.branch_name }}
git stash pop
git stash list | grep stash@{0} && git stash pop || echo "No stash to pop"
git commit README.md -m 'docs(README): Re-build README.Rmd' || echo "No changes to commit"
git push origin ${{ inputs.branch_name }}
2 changes: 1 addition & 1 deletion .github/workflows/update-lockfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,6 @@ jobs:
git remote set-url origin https://$GITHUB_ACTOR:${{ secrets.GH_PAT }}@github.com/$GITHUB_REPOSITORY.git
git stash
git pull --rebase origin ${{ inputs.branch_name }}
git stash pop
git stash list | grep stash@{0} && git stash pop || echo "No stash to pop"
git commit add pak.lock -m "chore: Update pak.lock" || echo "No changes to commit"
git push origin ${{ inputs.branch_name }}

0 comments on commit 97b19dc

Please sign in to comment.