smolkik_adm/ipranges
1
0
Fork 0
mirror of https://github.com/lord-alfred/ipranges.git synced 2026-09-19 23:36:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lord_Alfred
2021-10-22 12:03:36 +03:00
parent 96a2b10807
commit d26ac6ffbe
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/update.yml
+3 -2
View File
@@ -58,6 +58,9 @@ jobs:
run: | run: |
set -euo pipefail 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 # Get name & email from 1st commit
git config --local user.email "$(git log --format='%ae' --reverse | head -1)" git config --local user.email "$(git log --format='%ae' --reverse | head -1)"
git config --local user.name "$(git log --format='%an' --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" git commit -m "Auto-update ip ranges"
# push changes # 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} git push github HEAD:${GITHUB_REF}