From 3f13f8b9aeb85db6aa6c6d119e2a00e08258a2fd Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 12:12:28 -0600 Subject: [PATCH 1/4] Add beta branch origin/main --- 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 0aff5637..8a055e96 100644 --- a/beta/beta-branch.yml +++ b/beta/beta-branch.yml @@ -29,7 +29,7 @@ jobs: BRANCH=${GITHUB_REF##*/} git config user.name "Mikl Wolfe" git config user.email "wolfemikl@gmail.com" - git merge --allow-unrelated-histories main || true + git merge --allow-unrelated-histories origin/main || true git checkout --ours . git add . git commit -am 'Merge ${BRANCH} with main' From 35bfb9a75f2819849b7dcf2ff8e5ce6cfc01d40d Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 12:23:32 -0600 Subject: [PATCH 2/4] Add beta compile add token --- beta/beta-compile.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/beta/beta-compile.yml b/beta/beta-compile.yml index 325cdb66..da37214c 100644 --- a/beta/beta-compile.yml +++ b/beta/beta-compile.yml @@ -22,14 +22,15 @@ jobs: token: ${{ secrets.DISPATCH_REPO }} fetch-depth: 0 - - name: Merge branches + - name: Merge Branches + env: + GH_TOKEN: ${{ secrets.DISPATCH_REPO }} run: | - git checkout -b beta-compile - echo $(gh pr list -s open --json id) - # for pull_request in $(gh pr list -s open --json branch); do - # echo "Merge ${pull_request}" - # git merge ${pull_request} - # done + echo test: $(gh pr list -s open --json id) + for pull_request in $(gh pr list -s open --json branch); do + echo "Merge ${pull_request}" + git merge ${pull_request} + done - name: Push to Main run: | From 6dcda07308944edaf5837f37522ebe852cb28006 Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 12:48:10 -0600 Subject: [PATCH 3/4] Fix beta compile jobs --- beta/beta-compile.yml | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/beta/beta-compile.yml b/beta/beta-compile.yml index da37214c..f6132170 100644 --- a/beta/beta-compile.yml +++ b/beta/beta-compile.yml @@ -22,20 +22,30 @@ jobs: token: ${{ secrets.DISPATCH_REPO }} fetch-depth: 0 + - name: Pull GitLang Main + run: | + git checkout -b temp + ls -A1 | xargs rm -rf + git init + git config user.name "Mikl Wolfe" + 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 pull upstream main + - name: Merge Branches env: GH_TOKEN: ${{ secrets.DISPATCH_REPO }} run: | - echo test: $(gh pr list -s open --json id) - for pull_request in $(gh pr list -s open --json branch); do - echo "Merge ${pull_request}" - git merge ${pull_request} + echo test: $(gh pr list -s open --json baseRefName) + echo test: $(gh pr list -s open --json headRefName) + echo test: $(gh pr list -s open --json title) + for branch in $(gh pr list -s open --json headRefName); do + git merge --allow-unrelated-histories origin/${branch} || true done - name: Push to Main run: | git config user.name "Mikl Wolfe" git config user.email "wolfemikl@gmail.com" - git add . - git commit -am 'Beta compile' git push -u origin HEAD:main From 3cf60269f8ca68ad3608f2e4f643adb0c3883eb0 Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 12:55:46 -0600 Subject: [PATCH 4/4] Update username to chiefmikey --- .github/workflows/beta-build.yml | 2 +- .github/workflows/prod-build.yml | 2 +- beta/beta-branch.yml | 2 +- beta/beta-compile.yml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/beta-build.yml b/.github/workflows/beta-build.yml index 759c2f23..79b5219e 100644 --- a/.github/workflows/beta-build.yml +++ b/.github/workflows/beta-build.yml @@ -59,7 +59,7 @@ jobs: BRANCH=${{ github.head_ref }} echo test: ${BRANCH} echo test: $(git status) - git config user.name "Mikl Wolfe" + git config user.name "chiefmikey" git config user.email "wolfemikl@gmail.com" git remote set-url --add --push origin https://github.com/chiefmikey/gitlang-beta.git git add . diff --git a/.github/workflows/prod-build.yml b/.github/workflows/prod-build.yml index b8756c2c..69d9c10e 100644 --- a/.github/workflows/prod-build.yml +++ b/.github/workflows/prod-build.yml @@ -47,7 +47,7 @@ jobs: - name: Push run: | - git config user.name "Mikl Wolfe" + git config user.name "chiefmikey" git config user.email "wolfemikl@gmail.com" git add . git commit -am 'Update production build' diff --git a/beta/beta-branch.yml b/beta/beta-branch.yml index 8a055e96..957dffd2 100644 --- a/beta/beta-branch.yml +++ b/beta/beta-branch.yml @@ -27,7 +27,7 @@ jobs: GH_TOKEN: ${{ secrets.DISPATCH_REPO }} run: | BRANCH=${GITHUB_REF##*/} - git config user.name "Mikl Wolfe" + git config user.name "chiefmikey" git config user.email "wolfemikl@gmail.com" git merge --allow-unrelated-histories origin/main || true git checkout --ours . diff --git a/beta/beta-compile.yml b/beta/beta-compile.yml index f6132170..4de85081 100644 --- a/beta/beta-compile.yml +++ b/beta/beta-compile.yml @@ -27,7 +27,7 @@ jobs: git checkout -b temp ls -A1 | xargs rm -rf git init - git config user.name "Mikl Wolfe" + 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 @@ -46,6 +46,6 @@ jobs: - name: Push to Main run: | - git config user.name "Mikl Wolfe" + git config user.name "chiefmikey" git config user.email "wolfemikl@gmail.com" git push -u origin HEAD:main