Skip to content

Commit c30c3b2

Browse files
committed
support specifying only certain projects to be built
I frequently want to do this, but I basically never want to pass options to dbuild, which is what the script allowed easily before. now we can just do e.g.: ./run.sh scalatest,scalacheck,specs2 or equivalently in Jenkins specify scala_build_extra_opt to be "scalatest,scalacheck,specs" (I should update Jenkins to use a more meaningful name for this)
1 parent d835575 commit c30c3b2

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

run.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
# This script is suitable for local use.
44
# It is also invoked by Jenkins (from scripts/jobs/integrate/community-build).
55

6-
# usage: ./run.sh [<dbuild-options>]
6+
# usage:
7+
# ./run.sh
8+
# ./run.sh project1
9+
# ./run.sh project1,project2,project3
710

811
set -e
912
set -o pipefail
@@ -40,8 +43,8 @@ fi
4043
# use -n since running locally you don't want notifications sent,
4144
# and on our Jenkins setup it doesn't actually work (for now anyway)
4245

43-
echo "dbuild-${DBUILDVERSION}/bin/dbuild" -n "${@}" "$DBUILDCONFIG"
44-
"dbuild-${DBUILDVERSION}/bin/dbuild" -n "${@}" "$DBUILDCONFIG" 2>&1 | tee "dbuild-${DBUILDVERSION}/dbuild.out"
46+
echo "dbuild-${DBUILDVERSION}/bin/dbuild" -n "$DBUILDCONFIG" "${@}"
47+
"dbuild-${DBUILDVERSION}/bin/dbuild" -n "$DBUILDCONFIG" "${@}" 2>&1 | tee "dbuild-${DBUILDVERSION}/dbuild.out"
4548
STATUS="$?"
4649
BUILD_ID="$(grep '^\[info\] uuid = ' "dbuild-${DBUILDVERSION}/dbuild.out" | sed -e 's/\[info\] uuid = //')"
4750
echo "The repeatable UUID of this build was: ${BUILD_ID}"

scripts/jobs/integrate/community-build

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,8 @@ set -e
77
rm -rf target-$DBUILDVERSION/project-builds
88
rm -rf target-$DBUILDVERSION/extraction
99

10-
scripts/run.sh "${@}"
10+
# TODO: in scala-jenkins-infra, make an actual parameter for
11+
# specifying projects to be built, instead of hijacking the
12+
# "scala_build_extra_opt" name for that purpose
13+
14+
./run.sh $scala_build_extra_opt

0 commit comments

Comments
 (0)