Skip to content

Update prune beta to branch -a #188

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 1 commit into from
Aug 22, 2022
Merged

Update prune beta to branch -a #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion .github/workflows/prune-beta.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
4 changes: 2 additions & 2 deletions beta/beta-branch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
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 @@ -33,7 +33,7 @@ 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
done

- name: Push to Main
Expand Down