[arvados] updated: 2.7.0-41-gb95cc65317

[git repository hosting]

Summary of changes:
 build/package-build-dockerfiles/debian11/Dockerfile | 3 ++-
 build/run-build-packages-one-target.sh              | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

       via  b95cc6531716d4376d7e1922568826af6f2c4c2e (commit)
      from  f069c64482ba4cac50b950648ee25332060c23fe (commit)

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 b95cc6531716d4376d7e1922568826af6f2c4c2e
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Wed Dec 6 19:05:09 2023 -0500

    Try this way of checking out correct branch instead
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/build/package-build-dockerfiles/debian11/Dockerfile b/build/package-build-dockerfiles/debian11/Dockerfile
index d7956a66c0..9acd30c754 100644
--- a/build/package-build-dockerfiles/debian11/Dockerfile
+++ b/build/package-build-dockerfiles/debian11/Dockerfile
@@ -66,8 +66,9 @@ ENV MAKE "make --jobs $(grep -c processor /proc/cpuinfo)"
 # Preseed the go module cache and the ruby gems, using the currently checked
 # out branch of the source tree. This avoids potential compatibility issues
 # between the version of Ruby and certain gems.
-RUN git clone --depth 1 --branch ${BRANCH} git://git.arvados.org/arvados.git /tmp/arvados && \
+RUN git clone git://git.arvados.org/arvados.git /tmp/arvados && \
     cd /tmp/arvados && \
+    if [[ -n "${BRANCH}" ]]; then git checkout ${BRANCH}; fi && \
     cd /tmp/arvados/services/api && \
     /usr/local/rvm/bin/rvm-exec default bundle install && \
     cd /tmp/arvados/apps/workbench && \
diff --git a/build/run-build-packages-one-target.sh b/build/run-build-packages-one-target.sh
index 29370279c6..064de4f9d7 100755
--- a/build/run-build-packages-one-target.sh
+++ b/build/run-build-packages-one-target.sh
@@ -203,7 +203,7 @@ if [[ "$SKIP_DOCKER_BUILD" != 1 ]] ; then
     cd $TARGET
     time docker build --tag "$IMAGE" \
 	 --build-arg HOSTTYPE=$HOSTTYPE \
-	 --build-arg BRANCH=$(git rev-parse --abbrev-ref HEAD) \
+	 --build-arg BRANCH=$(git rev-parse HEAD) \
 	 --build-arg GOVERSION=$GOVERSION --no-cache .
     popd
 fi

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


hooks/post-receive
--