projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16212: Merge branch 'master'
[arvados.git]
/
build
/
run-library.sh
diff --git
a/build/run-library.sh
b/build/run-library.sh
index 46b4dc60458c4fce6249ed4c6acf71259d7f933e..ac5dc718be1c6e36e86e743bf0805ab11c891da7 100755
(executable)
--- a/
build/run-library.sh
+++ b/
build/run-library.sh
@@
-57,7
+57,7
@@
version_from_git() {
local git_ts git_hash
declare $(format_last_commit_here "git_ts=%ct git_hash=%h" "$subdir")
local git_ts git_hash
declare $(format_last_commit_here "git_ts=%ct git_hash=%h" "$subdir")
- ARVADOS_BUILDING_VERSION="$(
git tag -l |sort -V -r |head -n1).$(date -ud "@$git_ts" +%Y%m%d%H%M%S
)"
+ ARVADOS_BUILDING_VERSION="$(
$WORKSPACE/build/version-at-commit.sh $git_hash
)"
echo "$ARVADOS_BUILDING_VERSION"
}
echo "$ARVADOS_BUILDING_VERSION"
}
@@
-475,9
+475,9
@@
fpm_build_virtualenv () {
rm -rf dist/*
# Get the latest setuptools
rm -rf dist/*
# Get the latest setuptools
- if ! $pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U
setuptools
; then
+ if ! $pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U
'setuptools<45'
; then
echo "Error, unable to upgrade setuptools with"
echo "Error, unable to upgrade setuptools with"
- echo " $pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U
setuptools
"
+ echo " $pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U
'setuptools<45'
"
exit 1
fi
# filter a useless warning (when building the cwltest package) from the stderr output
exit 1
fi
# filter a useless warning (when building the cwltest package) from the stderr output
@@
-532,9
+532,9
@@
fpm_build_virtualenv () {
fi
echo "pip version: `build/usr/share/$python/dist/$PYTHON_PKG/bin/$pip --version`"
fi
echo "pip version: `build/usr/share/$python/dist/$PYTHON_PKG/bin/$pip --version`"
- if ! build/usr/share/$python/dist/$PYTHON_PKG/bin/$pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U
setuptools
; then
+ if ! build/usr/share/$python/dist/$PYTHON_PKG/bin/$pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U
'setuptools<45'
; then
echo "Error, unable to upgrade setuptools with"
echo "Error, unable to upgrade setuptools with"
- echo " build/usr/share/$python/dist/$PYTHON_PKG/bin/$pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U
setuptools
"
+ echo " build/usr/share/$python/dist/$PYTHON_PKG/bin/$pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U
'setuptools<45'
"
exit 1
fi
echo "setuptools version: `build/usr/share/$python/dist/$PYTHON_PKG/bin/$python -c 'import setuptools; print(setuptools.__version__)'`"
exit 1
fi
echo "setuptools version: `build/usr/share/$python/dist/$PYTHON_PKG/bin/$python -c 'import setuptools; print(setuptools.__version__)'`"