[ARVADOS] updated: 1.1.4-586-g5c2e355ac

[Git user]

Summary of changes:
 build/run-build-packages.sh | 4 ++++
 build/run-library.sh        | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

       via  5c2e355aca8dd456a646e743652a1be87113113f (commit)
      from  1980d00a9afeaea0bc6f266892e43de14ccd297e (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 5c2e355aca8dd456a646e743652a1be87113113f
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date:   Thu Jul 12 16:37:22 2018 -0300

    13667: test fail on rpm package
    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 caebac013..e9a859950 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -566,6 +566,8 @@ done <`dirname "$(readlink -f "$0")"`"/build.list"
 # Build the API server package
 test_rails_package_presence arvados-api-server "$WORKSPACE/services/api"
 if [[ "$?" == "0" ]]; then
+  version_file="$(version_from_git)"
+  echo "$version_file" >"$WORKSPACE/services/api/package-build.version"
   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." \
@@ -606,6 +608,8 @@ if [[ "$?" == "0" ]] ; then
     echo "ERROR: Asset precompilation failed"
     EXITCODE=1
   else
+    version_file="$(version_from_git)"
+    echo "$version_file" >"$WORKSPACE/apps/workbench/package-build.version"
     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." \
diff --git a/build/run-library.sh b/build/run-library.sh
index 92fdbea2b..c5a73cbe3 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -336,7 +336,7 @@ handle_rails_package() {
         switches+=(--iteration $RAILS_PACKAGE_ITERATION)
     fi
     # For some reason fpm excludes need to not start with /.
-    #local exclude_root="${railsdir#/}"
+    local exclude_root="${railsdir#/}"
     # .git and packages are for the SSO server, which is built from its
     # repository root.
     local -a exclude_list=(.git packages tmp log coverage Capfile\* \

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


hooks/post-receive
--