From fe0455585201c2d8c903154f9ca8c53f8243afdc Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 08:26:29 -0600 Subject: [PATCH 1/3] Add pull main --- beta/beta-branch.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/beta/beta-branch.yml b/beta/beta-branch.yml index f683ec55..5aa054f2 100644 --- a/beta/beta-branch.yml +++ b/beta/beta-branch.yml @@ -30,6 +30,7 @@ jobs: git config user.name "Mikl Wolfe" git config user.email "wolfemikl@gmail.com" git checkout main + git pull --rebase=false --autostash --no-edit origin main git reset --soft ${BRANCH} git add . git commit -am 'Beta branch' From b3286b36b29af1db29f730095ba464c53eaa93ba Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 08:33:02 -0600 Subject: [PATCH 2/3] Add build test --- .github/workflows/beta-build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/beta-build.yml b/.github/workflows/beta-build.yml index 15b9edc2..179eb68f 100644 --- a/.github/workflows/beta-build.yml +++ b/.github/workflows/beta-build.yml @@ -56,9 +56,13 @@ jobs: - name: Push to Beta run: | + BRANCH=${{ github.head_ref }} + echo test: ${BRANCH} + echo test: $(git status) git config user.name "Mikl Wolfe" git config user.email "wolfemikl@gmail.com" git remote set-url --add --push origin https://github.com/chiefmikey/gitlang-beta.git + git add . git commit -am 'Build beta branch' git reset $(git commit-tree HEAD^{tree} -m 'Update beta branch') From 852ec28b4b1cbc9c816990436c9db20e86a1a769 Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 10:20:07 -0600 Subject: [PATCH 3/3] Update beta branch to stash pull --- beta/beta-branch.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/beta/beta-branch.yml b/beta/beta-branch.yml index 5aa054f2..1b112729 100644 --- a/beta/beta-branch.yml +++ b/beta/beta-branch.yml @@ -29,11 +29,5 @@ jobs: BRANCH=${GITHUB_REF##*/} git config user.name "Mikl Wolfe" git config user.email "wolfemikl@gmail.com" - git checkout main git pull --rebase=false --autostash --no-edit origin main - git reset --soft ${BRANCH} - git add . - git commit -am 'Beta 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 + gh pr create --title ${BRANCH} --body 'Beta branch' --base main --head ${BRANCH}