From: Arran Cudbard-Bell Date: Thu, 4 Mar 2021 14:47:58 +0000 (+0000) Subject: Everything happens on upstream branch X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0859fc47ca6dc78d38ca7428825390e31b11036a;p=thirdparty%2Ffreeradius-server.git Everything happens on upstream branch --- diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d226fb59994..c5e4b8a037a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -466,7 +466,7 @@ jobs: git checkout --progress --force -B upstream-branch "refs/remotes/upstream/$BRANCH" git merge "$BRANCH" --ff-only git push upstream "upstream-branch:$BRANCH" - git push origin "$BRANCH" || true + git push origin "upstream-branch:$BRANCH" || true env: USERNAME: ${{ github.actor }} REPO_KEY: ${{ secrets.PERSONAL_ACCESS_TOKEN }}