Browse Source

try to fix "fatal: Not possible to fast-forward, aborting"

pull/3/head
Lord_Alfred 4 years ago
parent
commit
d26ac6ffbe
  1. 5
      .github/workflows/update.yml

5
.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}

Loading…
Cancel
Save