[ARVADOS] updated: 2.1.0-12-ge94ddba9d

[Git user]

Summary of changes:
 build/run-library.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

       via  e94ddba9d544b173e5b56b41c6ac76ea0b072a26 (commit)
       via  c95df2beb29c07c9be48f05a20c628ad437c142f (commit)
       via  aa2908778c80944e7141f4819a15c95b8dd4eeb0 (commit)
      from  8127b5d5dd999248731dd67c1c99e2045795e3e2 (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 e94ddba9d544b173e5b56b41c6ac76ea0b072a26
Author: Ward Vandewege <ward at curii.com>
Date:   Thu Oct 15 21:23:38 2020 -0400

    When calculating the version of our Go and Rails deb/rpm packages, take
    the 'build' directory into account.
    
    refs #17011
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index 74475c242..bd4d1aeb1 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -130,9 +130,9 @@ calculate_go_package_version() {
       checkdirs+=("$1")
       shift
   done
-  if grep -qr git.arvados.org/arvados .; then
-      checkdirs+=(sdk/go lib)
-  fi
+  # Even our rails packages (version calculation happens here!) depend on a go component (arvados-server)
+  # Everything depends on the build directory.
+  checkdirs+=(sdk/go lib build)
   local timestamp=0
   for dir in ${checkdirs[@]}; do
       cd "$WORKSPACE"

commit c95df2beb29c07c9be48f05a20c628ad437c142f
Author: Ward Vandewege <ward at curii.com>
Date:   Thu Oct 15 21:04:55 2020 -0400

    Bugfix: fix detection of already generated Python deb/rpm packages.
    
    refs #16982
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index 47e3861a9..74475c242 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -529,8 +529,8 @@ fpm_build_virtualenv () {
       UNFILTERED_PYTHON_VERSION=$ARVADOS_BUILDING_VERSION
       PYTHON_VERSION=$(echo -n $ARVADOS_BUILDING_VERSION | sed s/~dev/.dev/g | sed s/~rc/rc/g)
   else
-      UNFILTERED_PYTHON_VERSION=$(awk '($1 == "Version:"){print $2}' *.egg-info/PKG-INFO)
-      PYTHON_VERSION=$UNFILTERED_PYTHON_VERSION
+      PYTHON_VERSION=$(awk '($1 == "Version:"){print $2}' *.egg-info/PKG-INFO)
+      UNFILTERED_PYTHON_VERSION=$(echo -n $PYTHON_VERSION | sed s/\.dev/~dev/g |sed 's/\([0-9]\)rc/\1~rc/g')
   fi
 
   # See if we actually need to build this package; does it exist already?

commit aa2908778c80944e7141f4819a15c95b8dd4eeb0
Author: Ward Vandewege <ward at curii.com>
Date:   Thu Oct 15 20:29:25 2020 -0400

    Fix whitespace in build/run-library.sh
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index 079a34313..47e3861a9 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -253,7 +253,7 @@ rails_package_version() {
     fi
     local version="$(version_from_git)"
     if [ $pkgname = "arvados-api-server" -o $pkgname = "arvados-workbench" ] ; then
-	calculate_go_package_version version cmd/arvados-server "$srcdir"
+        calculate_go_package_version version cmd/arvados-server "$srcdir"
     fi
     echo $version
 }

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


hooks/post-receive
--