Skip to content

Commit

Permalink
[master] we are clean enough already, thank you very much (2600hz#6062)
Browse files Browse the repository at this point in the history
* [master] we are clean enough already, thank you very much

* Clean the repo before adding the submodule
  • Loading branch information
swysor authored and icehess committed Sep 30, 2019
1 parent c8816ac commit cf2e8e5
Showing 1 changed file with 3 additions and 10 deletions.
13 changes: 3 additions & 10 deletions scripts/circleci.bash
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,11 @@ if [ ! -d $APP_PATH ]; then
git submodule add ${CIRCLE_REPOSITORY_URL} $APP_PATH
fi

cd $APP_PATH

echo checking out our commit $CIRCLE_BRANCH
git fetch --prune
git checkout -B $CIRCLE_BRANCH
git reset --hard $CIRCLE_SHA1

cd $KAZOO_ROOT

echo "make a pristine environment for the kazoo dir"
git clean -x -d -f

# wanted when committing
echo setup git config
git config user.email '[email protected]'
Expand All @@ -39,6 +35,3 @@ git config user.name 'CircleCI'
echo committing kazoo changes to avoid false positives later
git add .gitmodules $APP_PATH
git commit -m "add submodule"

echo cleaning up kazoo
make -k clean

0 comments on commit cf2e8e5

Please sign in to comment.