Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-05-10 07:44:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore(build): bugfixes to build scripts on Jenkins

Browse source
This commit is contained in:
Tobias Bosch 2014-01-06 15:48:30 -08:00
parent d4d58f287f
commit efbc242875
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scripts/angular.js/publish.sh
View file

@ -18,19 +18,12 @@ function init {
} }
function prepare() { function prepare() {
if ! git symbolic-ref --short HEAD; then
# We are on a detached branch, e.g. jenkins checks out shas instead of branches
# Jump onto the master branch and make sure we are using the latest
git checkout -f master
git merge --ff-only origin/master
fi
./scripts/angular.js/finalize-version.sh ./scripts/angular.js/finalize-version.sh
# Build # Build
if [[ $NO_TEST == "true" ]]; then if [[ $NO_TEST == "true" ]]; then
grunt package npm install --color false
grunt ci-checks package --no-color
else else
./jenkins_build.sh ./jenkins_build.sh
fi fi

3
scripts/jenkins/master.sh
View file

@ -12,7 +12,8 @@ function build {
cd ../.. cd ../..
if [[ $NO_TEST == "true" ]]; then if [[ $NO_TEST == "true" ]]; then
grunt package npm install --color false
grunt ci-checks package --no-color
else else
./jenkins_build.sh ./jenkins_build.sh
fi fi