Skip to content

Stash_pull #160

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 3 commits into from
Aug 22, 2022
Merged

Stash_pull #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe04555
Add pull main
chiefmikey Aug 22, 2022
b3286b3
Add build test
chiefmikey Aug 22, 2022
852ec28
Update beta branch to stash pull
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
4 changes: 4 additions & 0 deletions .github/workflows/beta-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,13 @@ jobs:

- name: Push to Beta
run: |
BRANCH=${{ github.head_ref }}
echo test: ${BRANCH}
echo test: $(git status)
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')
Expand Down
9 changes: 2 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,10 +29,5 @@ jobs:
BRANCH=${GITHUB_REF##*/}
git config user.name "Mikl Wolfe"
git config user.email "wolfemikl@gmail.com"
git checkout 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
git pull --rebase=false --autostash --no-edit origin main
gh pr create --title ${BRANCH} --body 'Beta branch' --base main --head ${BRANCH}