From 9196d1d37e2b9574230dc1b7688bee7cfdb70f51 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Thu, 22 Jun 2017 16:24:10 +0200
Subject: [PATCH] Support bob-devel versioning
---
install/from-scratch.sh | 7 ++++---
install/install-ci.sh | 7 ++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/install/from-scratch.sh b/install/from-scratch.sh
index 181f9ff..2331df0 100755
--- a/install/from-scratch.sh
+++ b/install/from-scratch.sh
@@ -4,14 +4,15 @@
set -e
if [ "${#}" != 3 ]; then
- echo "usage: `basename $0` <basedir> <name> <python-version>"
- echo "example: `basename $0` /opt/conda bob-devel-py35 3.5"
+ echo "usage: `basename $0` <basedir> <name> <python-version> <bob-devel>"
+ echo "example: `basename $0` /opt/conda bob-devel-py35 3.5 2017.06.06"
exit 1
fi
BASEDIR=$1
NAME=$2
PYTHON_VERSION=$3
+BOB_DEVEL_VERSION=$4
PYVER=`echo $PYTHON_VERSION | sed -e 's/\.//'`
CONDA=${BASEDIR}/bin/conda
@@ -24,6 +25,6 @@ if [ -d ${BASEDIR}/envs/${NAME} ]; then
fi
echo "[>>] Creating environment ${NAME} for python ${PYTHON_VERSION} with bob dependencies..."
-${CONDA} create --yes --name=${NAME} --override-channels --channel=http://www.idiap.ch/software/bob/conda --channel=defaults python=${PYTHON_VERSION} bob-devel
+${CONDA} create --yes --name=${NAME} --override-channels --channel=http://www.idiap.ch/software/bob/conda --channel=defaults python=${PYTHON_VERSION} bob-devel=${BOB_DEVEL}
echo "[>>] Bye!"
exit 0
diff --git a/install/install-ci.sh b/install/install-ci.sh
index efc4221..2c169be 100755
--- a/install/install-ci.sh
+++ b/install/install-ci.sh
@@ -2,14 +2,15 @@
# Sat 28 Jan 09:16:48 2017 CET
if [ "${#}" != 1 ]; then
- echo "usage: `basename $0` <prefix>"
- echo "example: `basename $0` /opt/conda"
+ echo "usage: `basename $0` <prefix> <bob-devel-version>"
+ echo "example: `basename $0` /opt/conda 2017.06.06"
exit 1
fi
BASEDIR=$1
BINDIR=$(dirname $0)
CONDA=${BASEDIR}/bin/conda
+BOB_DEVEL_VERSION=$2
echo "[>>] Cleaning conda cache..."
${CONDA} clean --all --yes
@@ -21,5 +22,5 @@ for k in 2.7 3.5 3.6; do
py=`echo $k | sed -e 's/\.//'`
e="bob-devel-py$py"
echo "[>>] Installing CI environment $e using python-$k..."
- ${BINDIR}/from-scratch.sh ${BASEDIR} $e $k
+ ${BINDIR}/from-scratch.sh ${BASEDIR} $e $k ${BOB_DEVEL_VERSION}
done
--
GitLab