Skip to content

restoring checkout of update branch to be a new branch #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

restoring checkout of update branch to be a new branch #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/contributors_automated.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I notice this is the only place with quotes for the branch. With quotes seems like the right way to go about it, let's apply that to other instances (at least for changed lines in this PR).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I paused working on this because we’d replace with cred-action anyway.

git branch

git config --global user.name "github-actions"
git config --global user.email "[email protected]"

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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/prototype_automated.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "[email protected]"

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
Expand Down