From bbb91161007ff90799a0ca77af8b2357325b29dd Mon Sep 17 00:00:00 2001 From: vsoch Date: Thu, 12 Mar 2020 05:37:09 -0600 Subject: [PATCH] restoring checkout of update branch to be a new branch previously we had just git checkout -b and this worked because the branch was not fetched on the github actions host - adding the OR to checkout an existing branch seems to have triggered an error. All I am doing here is restoring those lines in both recipes to what they used to be. Signed-off-by: vsoch --- .github/workflows/contributors_automated.yml | 4 ++-- .github/workflows/prototype_automated.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/contributors_automated.yml b/.github/workflows/contributors_automated.yml index efd3b71..f2c3551 100644 --- a/.github/workflows/contributors_automated.yml +++ b/.github/workflows/contributors_automated.yml @@ -34,13 +34,13 @@ jobs: git remote set-url origin "https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git" git branch printf "Branch to push to is ${UPDATE_BRANCH}\n" - git checkout -b ${UPDATE_BRANCH} || git checkout ${UPDATE_BRANCH} + git checkout -b "${UPDATE_BRANCH}" git branch git config --global user.name "github-actions" git config --global user.email "github-actions@users.noreply.github.com" - git pull origin ${UPDATE_BRANCH} || printf "Branch not yet on remote\n" + git pull origin ${UPDATE_BRANCH} || echo "Branch not yet on remote" git add contributors.svg if git diff-index --quiet HEAD --; then diff --git a/.github/workflows/prototype_automated.yml b/.github/workflows/prototype_automated.yml index c87e5a0..fd29eea 100644 --- a/.github/workflows/prototype_automated.yml +++ b/.github/workflows/prototype_automated.yml @@ -44,13 +44,13 @@ jobs: git remote set-url origin "https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git" git branch printf "Branch to push to is ${UPDATE_BRANCH}\n" - git checkout -b ${UPDATE_BRANCH} || git checkout ${UPDATE_BRANCH} + git checkout -b ${UPDATE_BRANCH} git branch git config --global user.name "github-actions" git config --global user.email "github-actions@users.noreply.github.com" - git pull origin ${UPDATE_BRANCH} || printf "Branch not yet on remote\n" + git pull origin ${UPDATE_BRANCH} || echo "Branch not yet on remote" git add docs/* if git diff-index --quiet HEAD --; then