diff options
| author | Harald Musum <musum@yahooinc.com> | 2024-05-29 15:56:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-29 15:56:51 +0200 |
| commit | 7b671c659dadb3bdd54a20b2cac472e1b08b5c3a (patch) | |
| tree | 17648660ac729f856270d52b1aafb1405d210231 | |
| parent | 943036c7096b2e971f2500fe0685c388f2d7aa05 (diff) | |
| parent | 7b242f3b2ca191d75028fc3c4311f6564558164b (diff) | |
Merge pull request #31334 from vespa-engine/aressem/dont-compile-go-twice
The client/go code is compiled with the cmake setup. No need to do th…
| -rw-r--r-- | .buildkite/Makefile | 6 | ||||
| -rwxr-xr-x | .buildkite/install.sh | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.buildkite/Makefile b/.buildkite/Makefile index 0e7c5ec2d72..9510fae43fd 100644 --- a/.buildkite/Makefile +++ b/.buildkite/Makefile @@ -38,9 +38,6 @@ check: prepare: check @$(TOP)/execute.sh $@ -go: prepare - @$(TOP)/execute.sh $@ - bootstrap: prepare @$(TOP)/execute.sh $@ @@ -59,7 +56,7 @@ cpp-test: cpp install: cpp java @$(TOP)/execute.sh $@ -build-rpms: install go +build-rpms: install @$(TOP)/execute.sh $@ basic-search-test: build-rpms @@ -81,7 +78,6 @@ publish-artifacts: java build-rpms main \ pr \ prepare \ - go \ bootstrap \ bootstrap-cmake \ java \ diff --git a/.buildkite/install.sh b/.buildkite/install.sh index d5bf30b5610..42faf5be076 100755 --- a/.buildkite/install.sh +++ b/.buildkite/install.sh @@ -3,3 +3,7 @@ set -euo pipefail make -j "$NUM_CPU_LIMIT" install DESTDIR="$WORKDIR/vespa-install" + +# The cmake install does not handle install into /usr/share/man. Do it explicitly here. +mkdir -p "$WORKDIR/vespa-install/usr/share/man/man1" +"$WORKDIR/vespa-install/opt/vespa/bin/vespa" man "$WORKDIR/vespa-install/usr/share/man/man1" |