From 4c5cddef4cf5b33197e3c103294a1383cbdc2fa5 Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Sun, 21 Aug 2022 23:42:31 -0600 Subject: [PATCH 1/3] Add beta branch git credentials --- beta/beta-branch.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/beta/beta-branch.yml b/beta/beta-branch.yml index 50d4e1a0..07b20dce 100644 --- a/beta/beta-branch.yml +++ b/beta/beta-branch.yml @@ -25,5 +25,7 @@ jobs: env: GH_TOKEN: ${{ secrets.DISPATCH_REPO }} run: | + git config user.name "Mikl Wolfe" + git config user.email "wolfemikl@gmail.com" git pull --rebase=false --autostash --no-edit --allow-unrelated-histories origin main gh pr create --title '${GITHUB_REF##*/}' --body 'Beta branch' From 7c8806a178cf656e9c8131b4e200bf474674943c Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Sun, 21 Aug 2022 23:52:00 -0600 Subject: [PATCH 2/3] Add beta branch git checkout --- beta/beta-branch.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/beta/beta-branch.yml b/beta/beta-branch.yml index 07b20dce..dadbe3c6 100644 --- a/beta/beta-branch.yml +++ b/beta/beta-branch.yml @@ -20,12 +20,13 @@ jobs: uses: actions/checkout@v3 with: token: ${{ secrets.DISPATCH_REPO }} + fetch-depth: 0 - name: Open PR env: GH_TOKEN: ${{ secrets.DISPATCH_REPO }} run: | - git config user.name "Mikl Wolfe" - git config user.email "wolfemikl@gmail.com" - git pull --rebase=false --autostash --no-edit --allow-unrelated-histories origin main + git checkout -b beta-branch + git checkout main + git reset --soft origin/beta-branch gh pr create --title '${GITHUB_REF##*/}' --body 'Beta branch' From 6c2f50b1e0fb211060730646f3ed2f1e93fdaed1 Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Sun, 21 Aug 2022 23:57:35 -0600 Subject: [PATCH 3/3] Remove origin/ --- beta/beta-branch.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/beta/beta-branch.yml b/beta/beta-branch.yml index dadbe3c6..2ab0f29f 100644 --- a/beta/beta-branch.yml +++ b/beta/beta-branch.yml @@ -26,7 +26,11 @@ jobs: env: GH_TOKEN: ${{ secrets.DISPATCH_REPO }} run: | + git config user.name "Mikl Wolfe" + git config user.email "wolfemikl@gmail.com" git checkout -b beta-branch git checkout main - git reset --soft origin/beta-branch + git reset --soft beta-branch + git add . + git commit -am 'Beta branch' gh pr create --title '${GITHUB_REF##*/}' --body 'Beta branch'