diff options
| author | Arnstein Ressem <aressem@verizonmedia.com> | 2021-10-01 09:03:06 +0200 |
|---|---|---|
| committer | Arnstein Ressem <aressem@verizonmedia.com> | 2021-10-01 09:03:06 +0200 |
| commit | c05960e0146829b27aee369270b1ee6379b18fa1 (patch) | |
| tree | adc89604118bf92396c537b93304cba0cd5f16e4 /screwdriver | |
| parent | 4d1754c799bc15e1851466f79672db0e77d9aff8 (diff) | |
Build the Go code in main and PR builds.
Diffstat (limited to 'screwdriver')
| -rwxr-xr-x | screwdriver/build-vespa.sh | 10 | ||||
| -rwxr-xr-x | screwdriver/detect-what-to-build.sh | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/screwdriver/build-vespa.sh b/screwdriver/build-vespa.sh index 46528bc301c..1fe0cc944dc 100755 --- a/screwdriver/build-vespa.sh +++ b/screwdriver/build-vespa.sh @@ -35,10 +35,14 @@ case $SHOULD_BUILD in ccache --show-stats ;; java) - ./bootstrap.sh java - mvn -V $VESPA_MAVEN_EXTRA_OPTS install - ;; + ./bootstrap.sh java + mvn -V $VESPA_MAVEN_EXTRA_OPTS install + ;; + go) + make -C client/go -j ${NUM_THREADS} + ;; *) + make -C client/go -j ${NUM_THREADS} ./bootstrap.sh java time mvn -V $VESPA_MAVEN_EXTRA_OPTS install cmake3 -DVESPA_UNPRIVILEGED=no . diff --git a/screwdriver/detect-what-to-build.sh b/screwdriver/detect-what-to-build.sh index 608dfda9e0e..401f78e0312 100755 --- a/screwdriver/detect-what-to-build.sh +++ b/screwdriver/detect-what-to-build.sh @@ -26,7 +26,9 @@ elif [[ -z $FILES ]]; then elif ! grep -v -E "(\.h|\.hh|\.hxx|\.c|\.cpp|\.cxx)$" <<< "$FILES" &> /dev/null; then SHOULD_BUILD=cpp elif ! grep -v -E "(\.java)$" <<< "$FILES" &> /dev/null; then - SHOULD_BUILD=java + SHOULD_BUILD=java +elif ! grep -v -E "(\.go)$" <<< "$FILES" &> /dev/null; then + SHOULD_BUILD=go else SHOULD_BUILD=all fi |