Git_add

.github/workflows/build-beta.yml

@@ -36,17 +36,17 @@ jobs:
       run : |
         rm -rf docs/index.html docs/404.html docs/CNAME .github
         mkdir .github .github/workflows
-        mv beta/beta-compile.yml beta/beta-branch.yml .github/workflows/
+        mv beta/beta-compile.yml beta/beta-pr.yml .github/workflows/
         mv beta/index.html beta/404.html beta/CNAME docs/
+        git add .
+        git commit -am 'Beta Files'
 
     - name: Push Beta
       run: |
         BRANCH=${{ github.head_ref }}
         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 .
-        git commit -am 'Beta Files'
         git reset $(git commit-tree HEAD^{tree} -m 'Beta Branch')
         git push -fu origin HEAD:refs/heads/${BRANCH}
         echo "https://beta.gitlang.net"

.github/workflows/prune-beta.yml

@@ -43,8 +43,9 @@ jobs:
       env:
         MERGED_BRANCHES: ${{ steps.checkout-beta.outputs.merged_branches }}
       run: |
+        echo test-ref: $(git status)
         BRANCH=${{ github.head_ref }}
-        BRANCHES=$(git branch)
+        BRANCHES=$(git branch -a)
         echo test merged: ${MERGED_BRANCHES}
         echo test branch: ${BRANCH}
         echo test branches: ${BRANCHES}

beta/beta-compile.yml

@@ -33,7 +33,8 @@ jobs:
           echo test: $(gh pr list -R chiefmikey/gitlang-beta -s open --json headRefName | jq -r '.[] | .headRefName')
           for branch in $(gh pr list -s open --json headRefName | jq -r '.[] | .headRefName'); do
             git fetch upstream ${branch}
-            git merge --allow-unrelated-histories ${branch} || true
+            git merge --allow-unrelated-histories upstream/${branch} || true
+            git add .
           done
 
       - name: Push to Main

beta/beta-branch.yml → beta/beta-pr.yml

@@ -1,4 +1,4 @@
-name: '${GITHUB_REF##*/}'
+name: 'Beta Pull Request'
 
 on:
   create
@@ -32,6 +32,6 @@ jobs:
           git merge --allow-unrelated-histories origin/main || true
           git checkout --ours .
           git add .
-          git commit -am 'Merge ${BRANCH} with main'
+          git commit -am "Merge ${BRANCH} with Main"
           git push -fu origin ${BRANCH}
-          gh pr create --title ${BRANCH} --body 'Beta branch' --base main --head ${BRANCH}
+          gh pr create --title "${BRANCH}" --body "https://github.com/chiefmikey/gitlang/tree/${BRANCH}" --base main --head ${BRANCH}