From ec5621b77d8bd22830378f5d20eb49695ff1bd52 Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 13:13:33 -0600 Subject: [PATCH 1/2] Add beta compile fetch branch --- beta/beta-compile.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/beta/beta-compile.yml b/beta/beta-compile.yml index 08c7558f..38d23ea4 100644 --- a/beta/beta-compile.yml +++ b/beta/beta-compile.yml @@ -38,11 +38,12 @@ jobs: run: | echo test: $(gh pr list -s open --json headRefName | jq -r '.[] | .headRefName') for branch in $(gh pr list -s open --json headRefName | jq -r '.[] | .headRefName'); do - git merge --allow-unrelated-histories origin/${branch} || true + git fetch origin ${branch} + git merge --allow-unrelated-histories ${branch} || true done - name: Push to Main run: | git config user.name "chiefmikey" git config user.email "wolfemikl@gmail.com" - git push -u origin HEAD:main + git push -fu origin main From b91390a3ecab9b88df4f11c29baf4ff0fec24afc Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 13:23:10 -0600 Subject: [PATCH 2/2] Add beta compile .git --- beta/beta-compile.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/beta/beta-compile.yml b/beta/beta-compile.yml index 38d23ea4..ebc7113b 100644 --- a/beta/beta-compile.yml +++ b/beta/beta-compile.yml @@ -28,8 +28,8 @@ jobs: git init -b main git config user.name "chiefmikey" git config user.email "wolfemikl@gmail.com" - git remote add origin https://github.com/chiefmikey/gitlang-beta - git remote add upstream https://github.com/chiefmikey/gitlang + git remote add origin https://github.com/chiefmikey/gitlang-beta.git + git remote add upstream https://github.com/chiefmikey/gitlang.git git pull upstream main - name: Merge Branches