From 38ea6d76d88ed787ec3d7cb7ab70d18e49f87bb1 Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 00:07:06 -0600 Subject: [PATCH 1/2] Add beta branch origin --- beta/beta-branch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beta/beta-branch.yml b/beta/beta-branch.yml index 695b0321..68e5fd1c 100644 --- a/beta/beta-branch.yml +++ b/beta/beta-branch.yml @@ -34,4 +34,4 @@ jobs: git add . git commit -am 'Beta branch' BRANCH=${GITHUB_REF##*/} - gh pr create --title '${BRANCH}' --body 'Beta branch' --base 'main' --head '${BRANCH}' + gh pr create --title ${BRANCH} --body 'Beta branch' --base 'main' --head origin/${BRANCH} From ec193c946c4114510dc81bd4a715a6456fec7dec Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 00:09:56 -0600 Subject: [PATCH 2/2] Add beta branch variable reset --- 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 68e5fd1c..2d45a41e 100644 --- a/beta/beta-branch.yml +++ b/beta/beta-branch.yml @@ -26,12 +26,11 @@ jobs: env: GH_TOKEN: ${{ secrets.DISPATCH_REPO }} run: | + BRANCH=${GITHUB_REF##*/} git config user.name "Mikl Wolfe" git config user.email "wolfemikl@gmail.com" - git checkout -b beta-branch git checkout main - git reset --soft beta-branch + git reset --soft ${BRANCH} git add . git commit -am 'Beta branch' - BRANCH=${GITHUB_REF##*/} - gh pr create --title ${BRANCH} --body 'Beta branch' --base 'main' --head origin/${BRANCH} + gh pr create --title ${BRANCH} --body 'Beta branch' --base 'main' --head ${BRANCH}