[ARVADOS] updated: 2.1.0-1782-gdec8b52c3

Git user git at public.arvados.org
Tue Jan 4 20:26:39 UTC 2022


Summary of changes:
 build/run-build-packages.sh | 1 +
 1 file changed, 1 insertion(+)

  discards  8c0013949dc735f44f0fa1e064848dd50a7fbf23 (commit)
  discards  2d1063022c48e1d1909f1b67e29f9aa6d6c90b41 (commit)
       via  dec8b52c3b3ff10ca63fe4b0bd2bf16cd9f8809d (commit)
       via  25cf4518ef59c42652f4692ccc4e4208cf42155a (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (8c0013949dc735f44f0fa1e064848dd50a7fbf23)
            \
             N -- N -- N (dec8b52c3b3ff10ca63fe4b0bd2bf16cd9f8809d)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit dec8b52c3b3ff10ca63fe4b0bd2bf16cd9f8809d
Author: Ward Vandewege <ward at curii.com>
Date:   Tue Jan 4 14:58:29 2022 -0500

    17417: remove libcloud pin, it is no longer used.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/build/libcloud-pin.sh b/build/libcloud-pin.sh
deleted file mode 100644
index 9cc2924e1..000000000
--- a/build/libcloud-pin.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (C) The Arvados Authors. All rights reserved.
-#
-# SPDX-License-Identifier: AGPL-3.0
-
-LIBCLOUD_PIN=2.3.1.dev2
-
-using_fork=true
-if [[ $using_fork = true ]]; then
-    LIBCLOUD_PIN_SRC="https://github.com/arvados/libcloud/archive/apache-libcloud-$LIBCLOUD_PIN.zip"
-else
-    LIBCLOUD_PIN_SRC=""
-fi
diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index 8e20e2749..cee37fa2e 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -4,7 +4,6 @@
 # SPDX-License-Identifier: AGPL-3.0
 
 . `dirname "$(readlink -f "$0")"`/run-library.sh || exit 1
-. `dirname "$(readlink -f "$0")"`/libcloud-pin.sh || exit 1
 
 read -rd "\000" helpmessage <<EOF
 $(basename $0): Build Arvados packages
diff --git a/build/run-tests.sh b/build/run-tests.sh
index d318bc60d..29e0d83d0 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -3,8 +3,6 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
-. `dirname "$(readlink -f "$0")"`/libcloud-pin.sh
-
 COLUMNS=80
 . `dirname "$(readlink -f "$0")"`/run-library.sh
 

commit 25cf4518ef59c42652f4692ccc4e4208cf42155a
Author: Ward Vandewege <ward at curii.com>
Date:   Tue Jan 4 14:50:27 2022 -0500

    17417: preseed the go module cache in our package build images. This
           makes them (much) bigger, but it really speeds up a quick one-off
           package build.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/build/package-build-dockerfiles/centos7/Dockerfile b/build/package-build-dockerfiles/centos7/Dockerfile
index 9a2ceb065..14a28901c 100644
--- a/build/package-build-dockerfiles/centos7/Dockerfile
+++ b/build/package-build-dockerfiles/centos7/Dockerfile
@@ -68,7 +68,9 @@ RUN git clone --depth 1 git://git.arvados.org/arvados.git /tmp/arvados && \
     cd /tmp/arvados/services/api && \
     /usr/local/rvm/bin/rvm-exec default bundle install && \
     cd /tmp/arvados/apps/workbench && \
-    /usr/local/rvm/bin/rvm-exec default bundle install
+    /usr/local/rvm/bin/rvm-exec default bundle install && \
+    cd /tmp/arvados && \
+    go mod download
 
 # The version of setuptools that comes with CentOS is way too old
 RUN pip3 install 'setuptools<45'
diff --git a/build/package-build-dockerfiles/debian10/Dockerfile b/build/package-build-dockerfiles/debian10/Dockerfile
index 7f1332714..d7c31411f 100644
--- a/build/package-build-dockerfiles/debian10/Dockerfile
+++ b/build/package-build-dockerfiles/debian10/Dockerfile
@@ -60,7 +60,9 @@ RUN git clone --depth 1 git://git.arvados.org/arvados.git /tmp/arvados && \
     cd /tmp/arvados/services/api && \
     /usr/local/rvm/bin/rvm-exec default bundle install && \
     cd /tmp/arvados/apps/workbench && \
-    /usr/local/rvm/bin/rvm-exec default bundle install
+    /usr/local/rvm/bin/rvm-exec default bundle install && \
+    cd /tmp/arvados && \
+    go mod download
 
 ENV WORKSPACE /arvados
 CMD ["/usr/local/rvm/bin/rvm-exec", "default", "bash", "/jenkins/run-build-packages.sh", "--target", "debian10"]
diff --git a/build/package-build-dockerfiles/debian11/Dockerfile b/build/package-build-dockerfiles/debian11/Dockerfile
index 02f156785..e819a28a7 100644
--- a/build/package-build-dockerfiles/debian11/Dockerfile
+++ b/build/package-build-dockerfiles/debian11/Dockerfile
@@ -60,7 +60,9 @@ RUN git clone --depth 1 git://git.arvados.org/arvados.git /tmp/arvados && \
     cd /tmp/arvados/services/api && \
     /usr/local/rvm/bin/rvm-exec default bundle install && \
     cd /tmp/arvados/apps/workbench && \
-    /usr/local/rvm/bin/rvm-exec default bundle install
+    /usr/local/rvm/bin/rvm-exec default bundle install && \
+    cd /tmp/arvados && \
+    go mod download
 
 ENV WORKSPACE /arvados
 CMD ["/usr/local/rvm/bin/rvm-exec", "default", "bash", "/jenkins/run-build-packages.sh", "--target", "debian11"]
diff --git a/build/package-build-dockerfiles/ubuntu1804/Dockerfile b/build/package-build-dockerfiles/ubuntu1804/Dockerfile
index fd9813883..b1a85d202 100644
--- a/build/package-build-dockerfiles/ubuntu1804/Dockerfile
+++ b/build/package-build-dockerfiles/ubuntu1804/Dockerfile
@@ -59,7 +59,9 @@ RUN git clone --depth 1 git://git.arvados.org/arvados.git /tmp/arvados && \
     cd /tmp/arvados/services/api && \
     /usr/local/rvm/bin/rvm-exec default bundle install && \
     cd /tmp/arvados/apps/workbench && \
-    /usr/local/rvm/bin/rvm-exec default bundle install
+    /usr/local/rvm/bin/rvm-exec default bundle install && \
+    cd /tmp/arvados && \
+    go mod download
 
 ENV WORKSPACE /arvados
 CMD ["/usr/local/rvm/bin/rvm-exec", "default", "bash", "/jenkins/run-build-packages.sh", "--target", "ubuntu1804"]
diff --git a/build/package-build-dockerfiles/ubuntu2004/Dockerfile b/build/package-build-dockerfiles/ubuntu2004/Dockerfile
index 89cdf199a..1de328029 100644
--- a/build/package-build-dockerfiles/ubuntu2004/Dockerfile
+++ b/build/package-build-dockerfiles/ubuntu2004/Dockerfile
@@ -59,7 +59,10 @@ RUN git clone --depth 1 git://git.arvados.org/arvados.git /tmp/arvados && \
     cd /tmp/arvados/services/api && \
     /usr/local/rvm/bin/rvm-exec default bundle install && \
     cd /tmp/arvados/apps/workbench && \
-    /usr/local/rvm/bin/rvm-exec default bundle install
+    /usr/local/rvm/bin/rvm-exec default bundle install && \
+    cd /tmp/arvados && \
+    go mod download
+
 
 ENV WORKSPACE /arvados
 CMD ["/usr/local/rvm/bin/rvm-exec", "default", "bash", "/jenkins/run-build-packages.sh", "--target", "ubuntu2004"]
diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index 7aa9f9bd2..8e20e2749 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -224,7 +224,7 @@ debug_echo -e "\nGo packages\n"
 
 # Go binaries
 cd $WORKSPACE/packages/$TARGET
-export GOPATH=$(mktemp -d)
+export GOPATH=~/go
 package_go_binary cmd/arvados-client arvados-client "$FORMAT" "$ARCH" \
     "Arvados command line tool (beta)"
 package_go_binary cmd/arvados-server arvados-server "$FORMAT" "$ARCH" \

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list