Skip to content

Remove_beta_branch #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 22, 2022
Merged

Remove_beta_branch #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
33c7838
Merge branch 'main' of github.com:chiefmikey/gitlang into add_commit_…
chiefmikey Aug 22, 2022
d9195c1
Add beta compile json id
chiefmikey Aug 22, 2022
ddc7cfb
Merge branch 'main' of github.com:chiefmikey/gitlang into json_id
chiefmikey Aug 22, 2022
5b7c8f0
Remove beta branch checkout beta branch
chiefmikey Aug 22, 2022
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
12 changes: 5 additions & 7 deletions beta/beta-branch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,9 @@ jobs:
BRANCH=${GITHUB_REF##*/}
git config user.name "Mikl Wolfe"
git config user.email "wolfemikl@gmail.com"
git checkout main
git merge --allow-unrelated-histories ${BRANCH} || true
git checkout --theirs .
git merge --allow-unrelated-histories main || true
git checkout --ours .
git add .
git commit -am 'Merge ${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
git commit -am 'Merge ${BRANCH} with main'
git push -fu origin ${BRANCH}
gh pr create --title ${BRANCH} --body 'Beta branch' --base main --head ${BRANCH}
2 changes: 1 addition & 1 deletion beta/beta-compile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Merge branches
run: |
git checkout -b beta-compile
echo $(gh pr list -s open --json)
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}
Expand Down