diff --git a/.circleci/config.yml b/.circleci/config.yml index 933bcd5..5942566 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,6 +31,7 @@ commands: - setup-automation - run: name: Build for platform + shell: /bin/bash command: | OSNICK=<> ./build/reqpacks/build - persist_to_workspace: diff --git a/build/reqpacks/build b/build/reqpacks/build index 0d5eea2..4e4dcdb 100755 --- a/build/reqpacks/build +++ b/build/reqpacks/build @@ -11,8 +11,10 @@ export READIES=$ROOT/deps/readies OSNICK=${OSNICK:-bionic} ARCH=${ARCH:-x64} -git branch |grep master -if [ $? -eq 0 ]; then +if [ -z ${CIRCLE_BRANCH} ]; then + branch=`git branch|grep '*'| cut -d ' ' -f 2-` +fi +if [ ${CIRCLE_BRANCH} == 'master' ]; then BRSPEC="" RGSYNC_VERSION=99.99.99 else @@ -25,11 +27,11 @@ if [[ -z $GEARS_VERSION ]]; then if [[ $RGSYNC_VERSION == 99.99.99 ]]; then GEARS_VERSION=master else - GEARS_VERSION=1.0.1 + GEARS_VERSION=1.0.7 fi fi -echo "RGSYNC_VERSION=$RGSYNC_VERSION" > $HERE/env +echo "RGSYNC_VERSION=${RGSYNC_VERSION//[[:space:]]/}" > $HERE/env $ROOT/deps/readies/bin/xtx -e BRSPEC $HERE/requirements.txt | sed -e '/^[ \t]*#/d' > $HERE/requirements.final cd $ROOT