[ARVADOS] updated: 1.1.3-160-gcb1dd0b
Git user
git at public.curoverse.com
Fri Mar 16 12:24:25 EDT 2018
Summary of changes:
build/run-build-packages.sh | 2 +-
build/run-library.sh | 4 ++--
sdk/cwl/setup.py | 2 +-
sdk/python/setup.py | 2 +-
services/dockercleaner/setup.py | 2 +-
services/nodemanager/setup.py | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
via cb1dd0bbd0e53328097014aab1cd79fe7e782853 (commit)
from 5441f659157f3fbe190c0bb6c3107a7b7d704345 (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 cb1dd0bbd0e53328097014aab1cd79fe7e782853
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date: Fri Mar 16 13:24:17 2018 -0300
13200:fix python gittagers version with latest git tag and timestamp
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 497545d..e1c9f02 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
# Copyright (C) The Arvados Authors. All rights reserved.
#
# SPDX-License-Identifier: AGPL-3.0
diff --git a/build/run-library.sh b/build/run-library.sh
index 83d069c..6c3b619 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -1,4 +1,4 @@
- #!/bin/bash
+#!/bin/bash
# Copyright (C) The Arvados Authors. All rights reserved.
#
# SPDX-License-Identifier: AGPL-3.0
@@ -72,7 +72,7 @@ timestamp_from_git() {
handle_python_package () {
# This function assumes the current working directory is the python package directory
- if [ -n "$(find dist -name "*-$ARVADOS_BUILDING_VERSION.$(date -ud "@$git_ts" +%Y%m%d%H%M%S).tar.gz" -print -quit)" ]; then
+ if [ -n "$(find dist -name "*-$(version_from_git).$(date -ud "@$git_ts" +%Y%m%d%H%M%S).tar.gz" -print -quit)" ]; then
# This package doesn't need rebuilding.
return
fi
diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index 353c0cf..5b1d737 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -16,7 +16,7 @@ README = os.path.join(SETUP_DIR, 'README.rst')
tagger = egg_info_cmd.egg_info
version = os.environ.get("ARVADOS_BUILDING_VERSION")
if not version:
- version = ""
+ version = "1.0"
try:
import gittaggers
tagger = gittaggers.EggInfoFromGit
diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index 5804517..88bf51e 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -15,7 +15,7 @@ README = os.path.join(SETUP_DIR, 'README.rst')
tagger = egg_info_cmd.egg_info
version = os.environ.get("ARVADOS_BUILDING_VERSION")
if not version:
- version = ""
+ version = "0.1"
try:
import gittaggers
tagger = gittaggers.EggInfoFromGit
diff --git a/services/dockercleaner/setup.py b/services/dockercleaner/setup.py
index 1506c20..6a6a96a 100644
--- a/services/dockercleaner/setup.py
+++ b/services/dockercleaner/setup.py
@@ -12,7 +12,7 @@ from setuptools import setup, find_packages
tagger = egg_info_cmd.egg_info
version = os.environ.get("ARVADOS_BUILDING_VERSION")
if not version:
- version = ""
+ version = "0.1"
try:
import gittaggers
tagger = gittaggers.EggInfoFromGit
diff --git a/services/nodemanager/setup.py b/services/nodemanager/setup.py
index 437e95e..454c24e 100644
--- a/services/nodemanager/setup.py
+++ b/services/nodemanager/setup.py
@@ -15,7 +15,7 @@ README = os.path.join(SETUP_DIR, 'README.rst')
tagger = egg_info_cmd.egg_info
version = os.environ.get("ARVADOS_BUILDING_VERSION")
if not version:
- version = ""
+ version = "0.1"
try:
import gittaggers
tagger = gittaggers.EggInfoFromGit
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list