Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 7 additions & 15 deletions beta/beta-compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,22 @@ jobs:
uses: actions/checkout@v3
with:
token: ${{ secrets.DISPATCH_REPO }}
repository: chiefmikey/gitlang
fetch-depth: 0

- name: Pull GitLang Main
run: |
ls -A1 | xargs rm -rf
git init -b main
git config user.name "chiefmikey"
git config user.email "wolfemikl@gmail.com"
git remote add origin https://github.com/chiefmikey/gitlang-beta.git
git remote add upstream https://github.com/chiefmikey/gitlang.git
git pull upstream main

- name: Merge Branches
env:
GH_TOKEN: ${{ secrets.DISPATCH_REPO }}
run: |
echo test: $(gh pr list -s open --json headRefName | jq -r '.[] | .headRefName')
git config user.name "chiefmikey"
git config user.email "wolfemikl@gmail.com"
git remote add upstream https://github.com/chiefmikey/gitlang-beta.git
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 origin ${branch}
git fetch upstream ${branch}
git merge --allow-unrelated-histories ${branch} || true
done

- name: Push to Main
run: |
git config user.name "chiefmikey"
git config user.email "wolfemikl@gmail.com"
git push -fu origin main
git push -fu upstream main