From 5dc27959d5c0e45cc0cc6133a9ef676cc15d44bd Mon Sep 17 00:00:00 2001 From: Tobias Bosch Date: Mon, 6 Jan 2014 12:19:51 -0800 Subject: chore(build): refactor build scripts in prepare/publish phase Refactored all scripts so that they are divided into a `prepare` and a `publish` phase. By this we can build, test, tag, commit everything first. Only if all of this is ok we start pushing to Github. By this we keep Github consistent even in error cases. Extracted include script `/scripts/utils.inc`: - parse and validate named arguments in the style `--name=value` - proxy git command and deactivate `git push` based on command option `--git_push_dry_run=true` (will be inherited to child scripts) - enable/disable bash debug mode by command option `--verbose=true` - dispatch to functions based on command option `--action=...` - helper functions for dealing with json files --- scripts/jenkins/release.sh | 66 ++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 38 deletions(-) (limited to 'scripts/jenkins/release.sh') diff --git a/scripts/jenkins/release.sh b/scripts/jenkins/release.sh index c0bb49c0..b4eee4c4 100755 --- a/scripts/jenkins/release.sh +++ b/scripts/jenkins/release.sh @@ -4,41 +4,31 @@ echo "#################################" echo "#### Cut release ################" echo "#################################" -if [ "$1" != "patch" -a "$1" != "minor" -a "$1" != "major" ]; then - echo "Please specify the next version type: patch|minor|major" - exit 1 -fi -BUMP_TYPE=$1 - -# Enable tracing and exit on first failure -set -xe - -# Jump onto the master branch and make sure we are using the latest -git checkout -f master -git merge --ff-only origin/master - - -# Normalize working dir to script dir -cd `dirname $0`/../.. - - -# Bump versions: remove "-snapshot" suffix -./scripts/jenkins/bump-remove-snapshot.sh - -# Build -./jenkins_build.sh - -# Bump versions: Increment version and add "-snapshot" -./scripts/jenkins/bump-increment.sh $BUMP_TYPE - -echo "-- push to Github" -# push the commits to github -git push origin master -# push the release tag -git push origin v`cat build/version.txt` - -# Update code.angularjs.org -./scripts/code.angularjs.org/publish.sh - -# Update bower -./scripts/bower/publish.sh +ARG_DEFS=( + "--next_version_type=(patch|minor|major)" + "--next-version-name=(.+)" + "[--no-test=true]" +) + +function init { + NG_ARGS=("$@") + if [[ $NO_TEST ]]; then + NG_ARGS+=(--no_test=true) + fi +} + +function phase { + ../angular.js/publish.sh --action=$1 "${NG_ARGS[@]}" + ../code.angularjs.org/publish.sh --action=$1 + ../bower/publish.sh --action=$1 +} + +function run { + # First prepare all scripts (build, test, commit, tag, ...), + # so we are sure everything is all right + phase prepare + # only then publish to github + phase publish +} + +source $(dirname $0)/../utils.inc -- cgit v1.2.3