From 3f13f8b9aeb85db6aa6c6d119e2a00e08258a2fd Mon Sep 17 00:00:00 2001 From: chiefmikey Date: Mon, 22 Aug 2022 12:12:28 -0600 Subject: [PATCH 1/3] 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/3] 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/3] 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