Merge pull request #93 from Microsoft/btelnes

Use Travis environment variables to determine the correct branch to use when cloning
This commit is contained in:
btelnes 2017-07-06 15:02:21 -07:00 коммит произвёл GitHub
Родитель 4ec8922384 15d2c2846b
Коммит ca97a7f7b0
1 изменённых файлов: 5 добавлений и 1 удалений

Просмотреть файл

@ -1,5 +1,9 @@
#!/usr/bin/env bash
# Determine the appropriate github branch to clone using Travis environment variables
BRANCH=${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}
echo "BRANCH=$BRANCH"
docker exec -i devstack /bin/bash -s <<EOF
# Ensure that MySql is running. Fixes error "Can't connect to MYSQL server on '127.0.0.1' (111)"
UP=$(/etc/init.d/mysql status | grep running | grep -v not | wc -l);
@ -11,7 +15,7 @@ sudo su edxapp
# Get the latest theme files
cd /edx/app/edxapp
rm -r -d -f themes
git clone -b oxa/devfic https://github.com/Microsoft/edx-theme.git themes
git clone -b $BRANCH https://github.com/Microsoft/edx-theme.git themes
# Source the edxapp_env file to set various required environment variables
source /edx/app/edxapp/edxapp_env