Skip to content

Commit

Permalink
[master] reverted to check out base branch until stable core is ready (
Browse files Browse the repository at this point in the history
…2600hz#6066)

* [master] reverted to checking out base branch until stable core is a thing

* Update circleci.bash

* added a helpful echo
  • Loading branch information
swysor authored and icehess committed Oct 1, 2019
1 parent 645a920 commit 0aa5744
Showing 1 changed file with 16 additions and 6 deletions.
22 changes: 16 additions & 6 deletions scripts/circleci.bash
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,27 @@ if [ ! -d $KAZOO_ROOT ]; then
git clone https://github.com/2600hz/kazoo $KAZOO_ROOT
fi

if [[ $BASE_BRANCH != "origin/master" ]]; then
CORE_IDENTITY=`curl https://api.github.com/repos/2600hz/kazoo/git/refs/tags | grep "refs" | sed 's|[^0-9\.]||g' | sort --version-sort | grep "${BASE_BRANCH#origin/}" | tail -1`
else
CORE_IDENTITY='master'
## TODO: when stable core is ready use this
#if [[ $BASE_BRANCH != "origin/master" ]]; then
# CORE_IDENTITY=`curl https://api.github.com/repos/2600hz/kazoo/git/refs/tags | grep "refs" | sed 's|[^0-9\.]||g' | sort --version-sort | grep "${BASE_BRANCH#origin/}" | tail -1`
#else
# CORE_IDENTITY='master'
#fi
## instead of this
if [[ -z $BASE_BRANCH ]]; then
BASE_BRANCH='origin/master'
fi

cd $KAZOO_ROOT

echo resetting kazoo-core to $CORE_IDENTITY
## TODO: when stable core is ready use this
#echo resetting kazoo-core to $CORE_IDENTITY
#git fetch --prune
#git checkout $CORE_IDENTITY

echo resetting kazoo-core to $BASE_BRANCH
git fetch --prune
git checkout $CORE_IDENTITY
git checkout $BASE_BRANCH

if [ ! -d $APP_PATH ]; then
echo adding submodule to $KAZOO_ROOT
Expand Down

0 comments on commit 0aa5744

Please sign in to comment.