Fixes to Travis Build Testing Scripts

This commit is contained in:
Mitchell Krog 2017-06-01 16:38:11 +02:00
parent a7fe038235
commit 7b5b90f40d
2 changed files with 6 additions and 6 deletions

View file

@ -21,7 +21,7 @@ git config --global push.default simple
git checkout master
# Modify our file and make sure Travis is owner
sudo $TRAVIS_BUILD_DIR/travis-ci/modify-globalblacklist.sh
sudo $TRAVIS_BUILD_DIR/travisCI/modify-globalblacklist.sh
sudo chown -R travis:travis $TRAVIS_BUILD_DIR/*
# Add the modified file to the and commit it

View file

@ -28,7 +28,7 @@ cd /usr/sbin
sudo ./install-ngxblocker -x
# Copy our default.vhost file into Nginx /sites-available/
sudo cp $TRAVIS_BUILD_DIR/travis-ci/default.vhost /etc/nginx/sites-available/default.vhost
sudo cp $TRAVIS_BUILD_DIR/travisCI/default.vhost /etc/nginx/sites-available/default.vhost
# Link the vhost file into Nginx /sites-enabled/ and reload nginx
sudo ln -s /etc/nginx/sites-available/default.vhost /etc/nginx/sites-enabled/default.vhost
@ -47,7 +47,7 @@ sudo nginx -c /etc/nginx/nginx.conf
#sudo service nginx reload
# Copy our index.php file into the default site's root folder
sudo cp $TRAVIS_BUILD_DIR/travis-ci/index.php /var/www/html/index.php
sudo cp $TRAVIS_BUILD_DIR/travisCI/index.php /var/www/html/index.php
# Run update-ngxblocker test
cd /usr/sbin
@ -57,8 +57,8 @@ sudo ./update-ngxblocker
#sudo service nginx reload
# Set all our other setup and deploy scripts to be executable
sudo chmod +x $TRAVIS_BUILD_DIR/travis-ci/modify-globalblacklist.sh
sudo chmod +x $TRAVIS_BUILD_DIR/travis-ci/deploy-package.sh
sudo chmod +x $TRAVIS_BUILD_DIR/travis-ci/change-file.sh
sudo chmod +x $TRAVIS_BUILD_DIR/travisCI/modify-globalblacklist.sh
sudo chmod +x $TRAVIS_BUILD_DIR/travisCI/deploy-package.sh
sudo chmod +x $TRAVIS_BUILD_DIR/travisCI/change-file.sh
# Travis now goes into the rest of the tests in the script: section of .travis.yml