diff --git a/.circleci/config.yml b/.circleci/config.yml index 29a3fcd..933bcd5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -120,7 +120,7 @@ workflows: parameters: platform: [bionic, xenial, centos7] context: common - <<: *on-integ-and-version-tags + <<: *on-any-branch - deploy-artifacts: context: common requires: diff --git a/build/reqpacks/build b/build/reqpacks/build index 0c3fb62..0d5eea2 100755 --- a/build/reqpacks/build +++ b/build/reqpacks/build @@ -11,12 +11,13 @@ export READIES=$ROOT/deps/readies OSNICK=${OSNICK:-bionic} ARCH=${ARCH:-x64} -if [[ `$ROOT/deps/readies/bin/istagfresh > /tmp/rgver 2> /dev/null; echo $?` == 0 ]]; then - BRSPEC="$(cat /tmp/rgver)" - RGSYNC_VERSION="$(cat /tmp/rgver | sed 's/^v\(.*\)/\1/')" -else +git branch |grep master +if [ $? -eq 0 ]; then BRSPEC="" RGSYNC_VERSION=99.99.99 +else + RGSYNC_VERSION=`grep version pyproject.toml |cut -d "=" -f 2-2|sed -e 's/"//g'` + BRSPEC=`git rev-list --max-count=1 HEAD` fi if [[ -z $GEARS_VERSION ]]; then diff --git a/sbin/system-setup.py b/sbin/system-setup.py index 03e5ba6..03622b8 100755 --- a/sbin/system-setup.py +++ b/sbin/system-setup.py @@ -44,8 +44,6 @@ def common_last(self): self.pip_install("--no-cache-dir git+https://github.com/Grokzen/redis-py-cluster.git@master") self.pip_install("--no-cache-dir git+https://github.com/RedisLabsModules/RLTest.git@master") self.pip_install("git+https://github.com/RedisGears/gears-cli.git") - self.pip_install("-r %s/requirements.txt" % ROOT) - self.pip_install("PyMySQL") #----------------------------------------------------------------------------------------------