Skip to content

Commit fb33e3d

Browse files
try git checkout master to get past detached_head issue
1 parent cfdc7a2 commit fb33e3d

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

travis-ci/changefile.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ git remote -v
1515
#echo "Third Check of Remote After Adding it"
1616
#ls -la $TRAVIS_BUILD_DIR
1717
#ls -la $TRAVIS_BUILD_DIR/.git
18-
git fetch origin master
18+
#git fetch origin master
1919
#git pull origin master
2020
#ls -la $TRAVIS_BUILD_DIR/.git
2121
#echo "Check permissions on git HEAD / get dir listing of travis build dir"

travis-ci/deploy2.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ MONTH=$(date +"%m")
44
cd $TRAVIS_BUILD_DIR
55
#git clone --depth=50 --branch=master https://github.com/mitchellkrogza/Travis-CI-Nginx-for-Testing-Nginx-Configuration.git mitchellkrogza/Travis-CI-Nginx-for-Testing-Nginx-Configuration
66
#git reset --hard $sha1
7+
git checkout master
78
git config --global user.email "${GIT_EMAIL}"
89
git config --global user.name "${GIT_NAME}"
910
git config --global push.default simple
10-
git fetch origin master
11-
git diff origin/master
11+
#git fetch origin master
12+
#git diff origin/master
1213
#git branch
1314
#git checkout $TRAVIS_BRANCH
1415
#git branch

travis-ci/install-nginx2.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@ sudo ./install-ngxblocker -x
7272
sudo cp $TRAVIS_BUILD_DIR/travis-ci/default.vhost /etc/nginx/sites-available/default.vhost
7373
sudo ln -s /etc/nginx/sites-available/default.vhost /etc/nginx/sites-enabled/default.vhost
7474
cd /usr/sbin
75-
sudo sh -x ./setup-ngxblocker -x
75+
# Below for Verbose Testing of setup-ngxblocker
76+
#sudo sh -x ./setup-ngxblocker -x
77+
sudo ./setup-ngxblocker -x
7678
sudo nginx -c /etc/nginx/nginx.conf
7779
sudo service nginx reload
7880
#sudo nginx -t &> /dev/stdout

0 commit comments

Comments
 (0)