From 2cbb0561449d0d3c9681b853cb7c622a08ca7873 Mon Sep 17 00:00:00 2001 From: seth Date: Sun, 7 Apr 2024 03:49:03 -0400 Subject: actions: force push PR branch if needed --- .github/workflows/update-lock.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/update-lock.yaml b/.github/workflows/update-lock.yaml index 5cd03bd..37aa705 100644 --- a/.github/workflows/update-lock.yaml +++ b/.github/workflows/update-lock.yaml @@ -57,7 +57,8 @@ jobs: BRANCH: ${{ steps.branch.outputs.branch }} run: | if ! git diff --color=always --exit-code origin/main; then - git push -u origin "$BRANCH" + git fetch origin "$BRANCH" || true + git push --force-with-lease -u origin "$BRANCH" gh pr create \ --base main \ -- cgit v1.2.3