From c4bb5a65b37f8544fb00a0725e693e3315024afd Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 08:13:34 -0600 Subject: [PATCH 1/2] Add branch push --- beta/beta-branch.yml | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/beta/beta-branch.yml b/beta/beta-branch.yml index 2c8f169f..79190507 100644 --- a/beta/beta-branch.yml +++ b/beta/beta-branch.yml @@ -29,27 +29,11 @@ jobs: BRANCH=${GITHUB_REF##*/} git config user.name "Mikl Wolfe" git config user.email "wolfemikl@gmail.com" - echo test first: $(git status) - TEST=$(git log) - echo test first: ${TEST%%Author*} git checkout main - echo test main: $(git status) - TEST=$(git log) - echo test main: ${TEST%%Author*} - git checkout -b beta-branch - echo test beta-branch: $(git status) - TEST=$(git log) - echo test beta-branch: ${TEST%%Author*} git reset --soft ${BRANCH} - echo test reset: $(git status) - TEST=$(git log) - echo test reset: ${TEST%%Author*} git add . git commit -am 'Beta branch' - echo test commit: $(git status) - TEST=$(git log) - echo test head: ${TEST%%Author*} - git checkout main - TEST=$(git log) - echo test base: ${TEST%%Author*} - gh pr create -R chiefmikey/gitlang-beta --title ${BRANCH} --body 'Beta branch' --base main --head beta-branch + git checkout ${BRANCH} + git reset --hard main + git push origin ${BRANCH} + gh pr create -R chiefmikey/gitlang-beta --title ${BRANCH} --body 'Beta branch' --base main --head ${BRANCH} From 42559e9c9534cfd7addf1573424fd941c561ea35 Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 08:21:48 -0600 Subject: [PATCH 2/2] Add push to beta-branch --- beta/beta-branch.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/beta/beta-branch.yml b/beta/beta-branch.yml index 79190507..f683ec55 100644 --- a/beta/beta-branch.yml +++ b/beta/beta-branch.yml @@ -33,7 +33,6 @@ jobs: git reset --soft ${BRANCH} git add . git commit -am 'Beta branch' - git checkout ${BRANCH} - git reset --hard main - git push origin ${BRANCH} - gh pr create -R chiefmikey/gitlang-beta --title ${BRANCH} --body 'Beta branch' --base main --head ${BRANCH} + git checkout -b beta-branch + git push -fu origin beta-branch + gh pr create --title ${BRANCH} --body 'Beta branch' --base main --head beta-branch