[ARVADOS] updated: 1.1.4-582-g29776dabd

[Git user]

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

       via  29776dabd84b8070b647ee38289214b7a56b2c1c (commit)
      from  146f7179c88c0d25acc91ff2b5faff8e7f98d1be (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 29776dabd84b8070b647ee38289214b7a56b2c1c
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date:   Wed Jul 11 17:10:00 2018 -0300

    13667: test add PKG_VERSION in run-build-packages
    Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>

diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index 82f99923e..512770b01 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -274,9 +274,9 @@ handle_python_package
       # go into detached-head state
       git checkout $DASHQ_UNLESS_DEBUG "$COMMIT_HASH"
       echo "$COMMIT_HASH" >git-commit.version
-
       cd "$SRC_BUILD_DIR"
       PKG_VERSION=$(version_from_git)
+      echo "$PKG_VERSION" >package-build.version
       cd $WORKSPACE/packages/$TARGET
       fpm_build $SRC_BUILD_DIR/=/usr/local/arvados/src arvados-src 'Curoverse, Inc.' 'dir' "$PKG_VERSION" "--exclude=usr/local/arvados/src/.git" "--url=https://arvados.org" "--license=GNU Affero General Public License, version 3.0" "--description=The Arvados source code" "--architecture=all"
 
@@ -569,8 +569,7 @@ if [[ "$?" == "0" ]]; then
   handle_rails_package arvados-api-server "$WORKSPACE/services/api" \
       "$WORKSPACE/agpl-3.0.txt" --url="https://arvados.org" \
       --description="Arvados API server - Arvados is a free and open source platform for big data science." \
-      --license="GNU Affero General Public License, version 3.0" \
-      -n "package-build.version" --config-files="/var/www/arvados-api/current/"
+      --license="GNU Affero General Public License, version 3.0"
 fi
 
 # Build the workbench server package
@@ -610,9 +609,7 @@ if [[ "$?" == "0" ]] ; then
     handle_rails_package arvados-workbench "$WORKSPACE/apps/workbench" \
         "$WORKSPACE/agpl-3.0.txt" --url="https://arvados.org" \
         --description="Arvados Workbench - Arvados is a free and open source platform for big data science." \
-        --license="GNU Affero General Public License, version 3.0" \
-        -n "package-build.version" --config-files="/var/www/arvados-workbench/current/"
-
+        --license="GNU Affero General Public License, version 3.0"
   fi
 fi
 

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


hooks/post-receive
--