From d26ac6ffbee0e653278a5a6b7d762479e7551e63 Mon Sep 17 00:00:00 2001 From: Lord_Alfred <2259979+lord-alfred@users.noreply.github.com> Date: Fri, 22 Oct 2021 12:03:36 +0300 Subject: [PATCH] try to fix "fatal: Not possible to fast-forward, aborting" --- .github/workflows/update.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index d38d5fb5..568bbb62 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -58,6 +58,9 @@ jobs: run: | set -euo pipefail + git remote add github "https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git" + git pull github ${GITHUB_REF} --ff-only + # Get name & email from 1st commit git config --local user.email "$(git log --format='%ae' --reverse | head -1)" git config --local user.name "$(git log --format='%an' --reverse | head -1)" @@ -71,6 +74,4 @@ jobs: git commit -m "Auto-update ip ranges" # push changes - git remote add github "https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git" - git pull github ${GITHUB_REF} --ff-only git push github HEAD:${GITHUB_REF}