diff --git a/.github/workflows/beta-build.yml b/.github/workflows/beta-build.yml index 179eb68f..759c2f23 100644 --- a/.github/workflows/beta-build.yml +++ b/.github/workflows/beta-build.yml @@ -62,7 +62,6 @@ jobs: git config user.name "Mikl Wolfe" 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 'Build beta branch' git reset $(git commit-tree HEAD^{tree} -m 'Update beta branch') diff --git a/beta/beta-branch.yml b/beta/beta-branch.yml index 1b112729..a299850f 100644 --- a/beta/beta-branch.yml +++ b/beta/beta-branch.yml @@ -29,5 +29,11 @@ jobs: BRANCH=${GITHUB_REF##*/} git config user.name "Mikl Wolfe" git config user.email "wolfemikl@gmail.com" - git pull --rebase=false --autostash --no-edit origin main - gh pr create --title ${BRANCH} --body 'Beta branch' --base main --head ${BRANCH} + git checkout main + git pull --rebase=false --autostash --no-edit --allow-unrelated-histories origin main + git reset --soft ${BRANCH} + git add . + git commit -am 'Beta branch' + git checkout -b beta-branch + git push -fu origin beta-branch + gh pr create --title ${BRANCH} --body 'Beta branch' --base main --head beta-branch