Skip to content

Commit c6844b2

Browse files
tboschjamesdaily
authored andcommitted
chore(build): bugfixes to build scripts on Jenkins
1 parent af21bff commit c6844b2

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

scripts/angular.js/publish.sh

+2-9
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,12 @@ function init {
1818
}
1919

2020
function prepare() {
21-
22-
if ! git symbolic-ref --short HEAD; then
23-
# We are on a detached branch, e.g. jenkins checks out shas instead of branches
24-
# Jump onto the master branch and make sure we are using the latest
25-
git checkout -f master
26-
git merge --ff-only origin/master
27-
fi
28-
2921
./scripts/angular.js/finalize-version.sh
3022

3123
# Build
3224
if [[ $NO_TEST == "true" ]]; then
33-
grunt package
25+
npm install --color false
26+
grunt ci-checks package --no-color
3427
else
3528
./jenkins_build.sh
3629
fi

scripts/jenkins/master.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ function build {
1212
cd ../..
1313

1414
if [[ $NO_TEST == "true" ]]; then
15-
grunt package
15+
npm install --color false
16+
grunt ci-checks package --no-color
1617
else
1718
./jenkins_build.sh
1819
fi

0 commit comments

Comments
 (0)