mirror of
https://github.com/Hopiu/angular.js.git
synced 2026-03-17 07:40:22 +00:00
chore(build): bugfixes to build scripts on Jenkins.
This commit is contained in:
parent
5dc27959d5
commit
dc89db33df
4 changed files with 13 additions and 14 deletions
|
|
@ -10,7 +10,7 @@ ARG_DEFS=(
|
|||
"--action=(prepare|publish)"
|
||||
"--next-version-type=(patch|minor|major)"
|
||||
"--next-version-name=(.+)"
|
||||
"[--no_test=true]"
|
||||
"[--no-test=(true|false)]"
|
||||
)
|
||||
|
||||
function init {
|
||||
|
|
@ -29,7 +29,7 @@ function prepare() {
|
|||
./scripts/angular.js/finalize-version.sh
|
||||
|
||||
# Build
|
||||
if [[ $NO_TEST ]]; then
|
||||
if [[ $NO_TEST == "true" ]]; then
|
||||
grunt package
|
||||
else
|
||||
./jenkins_build.sh
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@ echo "#### Update master ##############"
|
|||
echo "#################################"
|
||||
|
||||
ARG_DEFS=(
|
||||
"[--no-test=true]"
|
||||
"[--no-test=(true|false)]"
|
||||
)
|
||||
|
||||
function build {
|
||||
cd ../..
|
||||
|
||||
if [[ $NO_TEST ]]; then
|
||||
if [[ $NO_TEST == "true" ]]; then
|
||||
grunt package
|
||||
else
|
||||
./jenkins_build.sh
|
||||
|
|
|
|||
|
|
@ -5,16 +5,13 @@ echo "#### Cut release ################"
|
|||
echo "#################################"
|
||||
|
||||
ARG_DEFS=(
|
||||
"--next_version_type=(patch|minor|major)"
|
||||
"--next-version-type=(patch|minor|major)"
|
||||
"--next-version-name=(.+)"
|
||||
"[--no-test=true]"
|
||||
"[--no-test=(true|false)]"
|
||||
)
|
||||
|
||||
function init {
|
||||
NG_ARGS=("$@")
|
||||
if [[ $NO_TEST ]]; then
|
||||
NG_ARGS+=(--no_test=true)
|
||||
fi
|
||||
}
|
||||
|
||||
function phase {
|
||||
|
|
|
|||
|
|
@ -217,8 +217,8 @@ function git_push_dryrun_proxy {
|
|||
export ORIGIN_GIT=$(which git)
|
||||
|
||||
function git {
|
||||
local var
|
||||
ARGS=("$@")
|
||||
local ARGS=("$@")
|
||||
local RC
|
||||
if [[ $1 == "push" ]]; then
|
||||
ARGS+=("--dry-run" "--porcelain")
|
||||
echo "####### START GIT PUSH DRYRUN #######"
|
||||
|
|
@ -228,9 +228,11 @@ function git_push_dryrun_proxy {
|
|||
echo "${ARGS[@]}"
|
||||
fi
|
||||
$ORIGIN_GIT "${ARGS[@]}"
|
||||
RC=$?
|
||||
if [[ $1 == "push" ]]; then
|
||||
echo "####### END GIT PUSH DRYRUN #######"
|
||||
fi
|
||||
return $RC
|
||||
}
|
||||
|
||||
export -f git
|
||||
|
|
@ -240,11 +242,11 @@ function main {
|
|||
# normalize the working dir to the directory of the script
|
||||
cd $(dirname $0);SCRIPT_DIR=$(pwd)
|
||||
|
||||
ARG_DEFS+=("[--git-push-dryrun=true]" "[--verbose=true]")
|
||||
ARG_DEFS+=("[--git-push-dryrun=(true|false)]" "[--verbose=(true|false)]")
|
||||
parseArgs "$@"
|
||||
|
||||
# --git_push_dryrun argument
|
||||
if [[ $GIT_PUSH_DRYRUN ]]; then
|
||||
if [[ $GIT_PUSH_DRYRUN == "true" ]]; then
|
||||
git_push_dryrun_proxy
|
||||
fi
|
||||
|
||||
|
|
@ -252,7 +254,7 @@ function main {
|
|||
set -e
|
||||
|
||||
# --verbose argument
|
||||
if [[ $VERBOSE ]]; then
|
||||
if [[ $VERBOSE == "true" ]]; then
|
||||
set -x
|
||||
fi
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue