programmer/intermodal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rewrite done recipe for new merge workflow

Browse Source 
The new sign-preserving merge workflow is to just
wait until commits pass CI, and then push directly
to master on GitHub.

type: development
This commit is contained in:
Casey Rodarmor 2020-04-04 02:40:41 -07:00
parent 9d43fa4275
commit b16da8da5a
No known key found for this signature in database
GPG Key ID: 556186B153EC6FE0
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
justfile
View File

@ -25,11 +25,12 @@ push: check
# clean up feature branch BRANCH # clean up feature branch BRANCH
done BRANCH=`git rev-parse --abbrev-ref HEAD`: done BRANCH=`git rev-parse --abbrev-ref HEAD`:
git checkout master
git diff --no-ext-diff --quiet --exit-code git diff --no-ext-diff --quiet --exit-code
git pull --rebase github master git push github {{BRANCH}}:master
git checkout master
git rebase {{BRANCH}}
git diff --no-ext-diff --quiet --exit-code {{BRANCH}} -- git diff --no-ext-diff --quiet --exit-code {{BRANCH}} --
git branch -D {{BRANCH}} git branch -d {{BRANCH}}
test: test:
cargo test --all cargo test --all