diff options
| -rw-r--r-- | client/go/Makefile | 2 | ||||
| -rw-r--r-- | dist/vespa.spec | 2 | ||||
| -rw-r--r-- | screwdriver.yaml | 2 | ||||
| -rwxr-xr-x | screwdriver/build-vespa.sh | 4 |
4 files changed, 6 insertions, 4 deletions
diff --git a/client/go/Makefile b/client/go/Makefile index 58d15e9c139..bc4a60f61db 100644 --- a/client/go/Makefile +++ b/client/go/Makefile @@ -99,6 +99,8 @@ ifeq ($(VERSION),$(DEVEL_VERSION)) $(error Invalid release version: $(VERSION). Try 'git checkout vX.Y.Z' or 'env VERSION=X.Y.Z make ...') endif +install-all: all manpages + # # Development targets # diff --git a/dist/vespa.spec b/dist/vespa.spec index d872a43eb3e..3c96c6b0ce1 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -542,7 +542,7 @@ mvn --batch-mode -e -N io.takari:maven:wrapper -Dmaven=3.6.3 . make %{_smp_mflags} -VERSION=%{version} make -C client/go +VERSION=%{version} make -C client/go install-all %endif %install diff --git a/screwdriver.yaml b/screwdriver.yaml index d5d7ae646b1..6ea74ae8a1d 100644 --- a/screwdriver.yaml +++ b/screwdriver.yaml @@ -139,7 +139,7 @@ jobs: cd $WORKDIR/vespa export FACTORY_VESPA_VERSION=$VESPA_VERSION NUM_THREADS=$(( $(nproc) + 2 )) - time make -C client/go BIN=$WORKDIR/vespa-install/opt/vespa/bin SHARE=$WORKDIR/vespa-install/usr/share + time make -C client/go BIN=$WORKDIR/vespa-install/opt/vespa/bin SHARE=$WORKDIR/vespa-install/usr/share install-all time ./bootstrap.sh java time mvn -T $NUM_THREADS $VESPA_MAVEN_EXTRA_OPTS install cmake3 -DVESPA_UNPRIVILEGED=no . diff --git a/screwdriver/build-vespa.sh b/screwdriver/build-vespa.sh index 714f4972e12..f321e3820fd 100755 --- a/screwdriver/build-vespa.sh +++ b/screwdriver/build-vespa.sh @@ -40,10 +40,10 @@ case $SHOULD_BUILD in mvn -V $VESPA_MAVEN_EXTRA_OPTS install ;; go) - make -C client/go + make -C client/go install-all ;; *) - make -C client/go + make -C client/go install-all ./bootstrap.sh java time mvn -V $VESPA_MAVEN_EXTRA_OPTS install cmake3 -DVESPA_UNPRIVILEGED=no . |