Skip to content

Update to git-flow-next #12

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

Open
mattyrob wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update to git-flow-next #12

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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ You'll need the following programs installed on your computer:
- `git`
- `nvm`: https://github.com/nvm-sh/nvm
- `convert` (part of https://imagemagick.org/)
- `git flow`: https://github.com/petervanderdoes/gitflow-avh ([Homebrew](https://formulae.brew.sh/formula/git-flow-avh))
- `git flow`: https://github.com/gittower/git-flow-next ([Homebrew](https://formulae.brew.sh/formula/git-flow-next))
- `gpg`
- `gnu-sed`: https://formulae.brew.sh/formula/gnu-sed (**MacOS only**)

Expand Down
12 changes: 6 additions & 6 deletions bin/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ for p in git nvm convert $SED_COMMAND; do
fi
done

if ! ( git flow 2>&1 | grep -q 'usage: git flow' ); then
echo '`git flow` not found, make sure it is installed!' >&2
if ! ( git flow 2>&1 | grep -q 'git-flow-next' ); then
echo '`git-flow-next` not found, make sure it is installed!' >&2
exit 1
fi

Expand Down Expand Up @@ -223,7 +223,7 @@ wait_cmd 'dev-update-develop' \
git checkout origin/develop -B develop

wait_cmd 'dev-release-start' \
git flow $RELEASE_TYPE start $VERSION+dev --showcommands
git flow $RELEASE_TYPE start $VERSION+dev

wait_action 'dev-apply-fixes' \
'if there are any security fixes or bugfixes (for a hotfix release not' \
Expand Down Expand Up @@ -262,7 +262,7 @@ wait_cmd 'dev-release-finish' \
GIT_COMMITTER_EMAIL='bots@classicpress.net' \
GIT_AUTHOR_NAME='ClassyBot Releases' \
GIT_AUTHOR_EMAIL='bots@classicpress.net' \
git flow $RELEASE_TYPE finish -u "$GPG_KEY_ID" --showcommands \
git flow $RELEASE_TYPE finish -u "$GPG_KEY_ID" \
$VERSION+dev -m 'Source code for release'

wait_cmd 'dev-release-push' \
Expand Down Expand Up @@ -316,7 +316,7 @@ wait_cmd 'release-git-status' \
wait_cmd 'release-git-stash' \
git stash
wait_cmd 'release-start' \
git flow $RELEASE_TYPE start $VERSION --showcommands
git flow $RELEASE_TYPE start $VERSION
wait_cmd 'release-git-stash-pop' \
git stash pop
wait_cmd 'release-git-add' \
Expand All @@ -331,7 +331,7 @@ wait_cmd 'release-finish' \
GIT_COMMITTER_EMAIL='bots@classicpress.net' \
GIT_AUTHOR_NAME='ClassyBot Releases' \
GIT_AUTHOR_EMAIL='bots@classicpress.net' \
git flow $RELEASE_TYPE finish -u "$GPG_KEY_ID" --showcommands \
git flow $RELEASE_TYPE finish -u "$GPG_KEY_ID" \
"$VERSION" -m 'Release'

wait_cmd 'release-push' \
Expand Down