diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 9a3a02a2..17cdffa7 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -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: diff --git a/Tagfile b/Tagfile index 0afe921c..24dba6d9 100644 --- a/Tagfile +++ b/Tagfile @@ -1 +1 @@ -0.48.18 +0.48.19