Skip to content

Commit

Permalink
fixup Tagfile commit on dependabot PRs so CI can run 4/4...
Browse files Browse the repository at this point in the history
Signed-off-by: Pierre Fenoll <[email protected]>
  • Loading branch information
fenollp committed Jan 23, 2024
1 parent 79638cd commit 6993e9e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,13 @@ jobs:
- name: Maybe push new Tagfile
run: |
git add Tagfile
COMMITHASH=$(git rev-parse --short HEAD)
if git status -bs Tagfile | grep Tagfile; then
COMMITHASH=$(git rev-parse --short HEAD)
git config --global user.name 'dependabot[bot]'
git config --global user.email '49699333+dependabot[bot]@users.noreply.github.com'
# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/managing-pull-requests-for-dependency-updates#allowing-dependabot-to-rebase-and-force-push-over-extra-commits
git commit -m '[dependabot skip] Bump Tagfile'
GIT_SEQUENCE_EDITOR="sed -i -re 's/^pick $COMMITHASH/f $COMMITHASH/'" git rebase -i HEAD~2
git commit --fixup "$COMMITHASH"
git rebase -i --autosquash "$COMMITHASH"~
git push --force origin "$BRANCH"
fi
env:
Expand Down
2 changes: 1 addition & 1 deletion Tagfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.48.18
0.48.19

0 comments on commit 6993e9e

Please sign in to comment.