From e7388d8a13d2b22967e2b5eefab389977e9de5d5 Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 10:25:24 -0600 Subject: [PATCH 1/3] Add beta build allow unrelated histories --- .github/workflows/beta-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/beta-build.yml b/.github/workflows/beta-build.yml index 179eb68f..4aea4648 100644 --- a/.github/workflows/beta-build.yml +++ b/.github/workflows/beta-build.yml @@ -61,7 +61,7 @@ jobs: 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 remote set-url --add --push --allow-unrelated-histories origin https://github.com/chiefmikey/gitlang-beta.git git add . git commit -am 'Build beta branch' From 04418f4cd2740190ff187dda417e5c5e2d50ebc4 Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 10:56:52 -0600 Subject: [PATCH 2/3] Fix unrelated histories flag --- .github/workflows/beta-build.yml | 2 +- beta/beta-branch.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/beta-build.yml b/.github/workflows/beta-build.yml index 4aea4648..179eb68f 100644 --- a/.github/workflows/beta-build.yml +++ b/.github/workflows/beta-build.yml @@ -61,7 +61,7 @@ jobs: echo test: $(git status) git config user.name "Mikl Wolfe" git config user.email "wolfemikl@gmail.com" - git remote set-url --add --push --allow-unrelated-histories origin https://github.com/chiefmikey/gitlang-beta.git + git remote set-url --add --push origin https://github.com/chiefmikey/gitlang-beta.git git add . git commit -am 'Build beta branch' diff --git a/beta/beta-branch.yml b/beta/beta-branch.yml index 5aa054f2..a299850f 100644 --- a/beta/beta-branch.yml +++ b/beta/beta-branch.yml @@ -30,7 +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 pull --rebase=false --autostash --no-edit --allow-unrelated-histories origin main git reset --soft ${BRANCH} git add . git commit -am 'Beta branch' From 9ab3e1d68d531307ce0f8a6cb60d93a6b36180cb Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 10:59:01 -0600 Subject: [PATCH 3/3] Remove line --- .github/workflows/beta-build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/beta-build.yml b/.github/workflows/beta-build.yml index 179eb68f..759c2f23 100644 --- a/.github/workflows/beta-build.yml +++ b/.github/workflows/beta-build.yml @@ -62,7 +62,6 @@ jobs: 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')