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
9 changes: 5 additions & 4 deletions beta/beta-compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ jobs:
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 remote add upstream https://github.com/chiefmikey/gitlang
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
Expand All @@ -38,11 +38,12 @@ jobs:
run: |
echo test: $(gh pr list -s open --json headRefName | jq -r '.[] | .headRefName')
for branch in $(gh pr list -s open --json headRefName | jq -r '.[] | .headRefName'); do
git merge --allow-unrelated-histories origin/${branch} || true
git fetch origin ${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 -u origin HEAD:main
git push -fu origin main