From 6c2f50b1e0fb211060730646f3ed2f1e93fdaed1 Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Sun, 21 Aug 2022 23:57:35 -0600 Subject: [PATCH 1/2] 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' From 1cd57c2c36d5040544ea389d28cc140fff2af658 Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 00:00:56 -0600 Subject: [PATCH 2/2] Add beta branch base and head --- 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 2ab0f29f..3d4ec1c3 100644 --- a/beta/beta-branch.yml +++ b/beta/beta-branch.yml @@ -33,4 +33,4 @@ jobs: git reset --soft beta-branch git add . git commit -am 'Beta branch' - gh pr create --title '${GITHUB_REF##*/}' --body 'Beta branch' + gh pr create --title '${GITHUB_REF##*/}' --body 'Beta branch' --base 'main' --head '${GITHUB_REF##*/}'