diff options
| author | Arnstein Ressem <aressem@verizonmedia.com> | 2021-10-01 09:38:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-01 09:38:16 +0200 |
| commit | 4ac89237299670b8e53e1706566d2acf43725e74 (patch) | |
| tree | b221a0746ab552ffb93ea62a3dc9d2fcc7305f78 | |
| parent | ba6fb61c10b2ea9719e1f375d2efaf3182a8e257 (diff) | |
| parent | 4193f9288aec4e329386607ef6f3a45ff3a7f625 (diff) | |
Merge pull request #19386 from vespa-engine/aressem/build-go-code
Build the Go code in main and PR builds.
| -rwxr-xr-x | screwdriver/build-vespa.sh | 4 | ||||
| -rwxr-xr-x | screwdriver/detect-what-to-build.sh | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/screwdriver/build-vespa.sh b/screwdriver/build-vespa.sh index 46528bc301c..51dda3a1658 100755 --- a/screwdriver/build-vespa.sh +++ b/screwdriver/build-vespa.sh @@ -38,7 +38,11 @@ case $SHOULD_BUILD in ./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..9c22a9463e2 100755 --- a/screwdriver/detect-what-to-build.sh +++ b/screwdriver/detect-what-to-build.sh @@ -27,6 +27,8 @@ elif ! grep -v -E "(\.h|\.hh|\.hxx|\.c|\.cpp|\.cxx)$" <<< "$FILES" &> /dev/null; SHOULD_BUILD=cpp elif ! grep -v -E "(\.java)$" <<< "$FILES" &> /dev/null; then SHOULD_BUILD=java +elif ! grep -v -E "(\.go)$" <<< "$FILES" &> /dev/null; then + SHOULD_BUILD=go else SHOULD_BUILD=all fi |