Update_username

.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 .

.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'

beta/beta-branch.yml

@@ -27,9 +27,9 @@ 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 main || true
+          git merge --allow-unrelated-histories origin/main || true
           git checkout --ours .
           git add .
           git commit -am 'Merge ${BRANCH} with main'

beta/beta-compile.yml

@@ -22,19 +22,30 @@ jobs:
           token: ${{ secrets.DISPATCH_REPO }}
           fetch-depth: 0
 
-      - name: Merge branches
+      - name: Pull GitLang Main
         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
+          git checkout -b temp
+          ls -A1 | xargs rm -rf
+          git init
+          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 pull upstream main
+
+      - name: Merge Branches
+        env:
+          GH_TOKEN: ${{ secrets.DISPATCH_REPO }}
+        run: |
+          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.name "chiefmikey"
           git config user.email "wolfemikl@gmail.com"
-          git add .
-          git commit -am 'Beta compile'
           git push -u origin HEAD:main