[ARVADOS] updated: 1.1.4-587-g8d75c13b5
Git user
git at public.curoverse.com
Thu Jul 12 15:51:27 EDT 2018
Summary of changes:
build/run-build-packages.sh | 4 ----
build/run-library.sh | 2 +-
2 files changed, 1 insertion(+), 5 deletions(-)
via 8d75c13b5601cb3450ad253cdddfef41499ba493 (commit)
from 5c2e355aca8dd456a646e743652a1be87113113f (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 8d75c13b5601cb3450ad253cdddfef41499ba493
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date: Thu Jul 12 16:51:13 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 e9a859950..caebac013 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -566,8 +566,6 @@ 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." \
@@ -608,8 +606,6 @@ 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 c5a73cbe3..ce3d174f9 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -310,7 +310,7 @@ handle_rails_package() {
cd "$srcdir"
local license_path="$1"; shift
local version="$(version_from_git)"
- echo "$version" >package-build.version
+ echo "$version" >package_build.version
local scripts_dir="$(mktemp --tmpdir -d "$pkgname-XXXXXXXX.scripts")" && \
(
set -e
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list