Skip to content

Commit

Permalink
fixup Tagfile commit on dependabot PRs so CI can run 3/3
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 b61e6a5 commit f3fae22
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ jobs:
github-token: "${{ secrets.GITHUB_TOKEN }}"
- uses: actions/checkout@v3
with:
fetch-depth: 0 # For $ git tag
ref: ${{ github.event.pull_request.head.ref }}
- name: Checkout master Tagfile
uses: actions/checkout@v3
Expand Down Expand Up @@ -78,10 +79,11 @@ jobs:
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~$COMMITHASH
git push --force
GIT_SEQUENCE_EDITOR="sed -i -re 's/^pick $COMMITHASH/f $COMMITHASH/'" git rebase -i HEAD~2
git push --force origin "$BRANCH"
fi
env:
BRANCH: ${{ github.event.pull_request.head.ref }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

check-goimports:
Expand Down
2 changes: 1 addition & 1 deletion Tagfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.48.17
0.48.18

0 comments on commit f3fae22

Please sign in to comment.