Skip to content
This repository was archived by the owner on Mar 8, 2020. It is now read-only.

drop in the detection script for live testing #1286

Merged
merged 6 commits into from
Jun 20, 2017
Merged

drop in the detection script for live testing #1286

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5dcc6a6
drop in the detection script for live testing
mbwhite Jun 15, 2017
4629d76
correct range variable
mbwhite Jun 15, 2017
e204400
updates
mbwhite Jun 16, 2017
2e582c8
Merge branch 'master' of github.com:hyperledger/composer into feature…
mbwhite Jun 16, 2017
083aa78
Merge branch 'master' into feature-docs-only
Jun 17, 2017
ba2fb4d
Merge branch 'master' into feature-docs-only
dselman Jun 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 45 additions & 2 deletions .travis/before-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ sudo rm /usr/local/bin/docker-compose
curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
chmod +x docker-compose
sudo mv docker-compose /usr/local/bin
echo "Docker-compose version: "
echo "Docker-compose version: "
docker-compose --version

# Update docker
Expand All @@ -22,7 +22,7 @@ curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
sudo apt-get update
sudo apt-get install docker-ce
echo "Docker version: "
echo "Docker version: "
docker --version

# Grab the parent (root) directory.
Expand Down Expand Up @@ -51,6 +51,49 @@ echo "->- Build cfg being used"
cat ${DIR}/build.cfg
echo "-<-"


######
# checking the changes that are in this file
echo "Travis commit range $TRAVIS_COMMIT_RANGE"
echo "Travis commit $TRAVIS_COMMIT"
echo "Travis event type $TRAVIS_EVENT_TYPE"


if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
echo -e "Build Pull Request #$TRAVIS_PULL_REQUEST => Branch [$TRAVIS_BRANCH]"
elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" == "" ]; then
echo -e 'Build Branch with Snapshot => Branch ['$TRAVIS_BRANCH']'
elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then
echo -e 'Build Branch for Release => Branch ['$TRAVIS_BRANCH'] Tag ['$TRAVIS_TAG']'
else
echo -e 'WARN: Should not be here => Branch ['$TRAVIS_BRANCH'] Tag ['$TRAVIS_TAG'] Pull Request ['$TRAVIS_PULL_REQUEST']'
fi


cd $TRAVIS_BUILD_DIR
git diff --name-only $(echo $TRAVIS_COMMIT_RANGE | sed 's/\.//')

if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
git show --pretty=format: --name-only "$TRAVIS_COMMIT_RANGE"|sort|uniq > changedfiles.log
elif [ -n "$TRAVIS_PULL_REQUEST" ]; then
git diff --name-only "$TRAVIS_COMMIT" "$TRAVIS_BRANCH" > changedfiles.log
fi

cat changedfiles.log | sed '/^\s*$/d' | awk '!/composer-website/ { exit 1 }'
if [ $? -eq 0 ]
then
echo "Only docs changes"
else
echo "More than docs changes"
fi
rm changedfiles.log

cd - > /dev/null
######




# Check of the task current executing
if [ "${FC_TASK}" = "docs" ]; then
echo Doing Docs - no requirement for installations of other software
Expand Down