diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 614e57b1..fb76f14a 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -73,11 +73,13 @@ jobs: run: | git add Tagfile 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 push + GIT_SEQUENCE_EDITOR="sed -i -re 's/^pick $COMMITHASH/f $COMMITHASH/'" git rebase -i HEAD~2 + git push --force fi env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/Tagfile b/Tagfile index 421a5629..727dd764 100644 --- a/Tagfile +++ b/Tagfile @@ -1 +1 @@ -0.48.14 +0.48.15