Skip to content

Commit 7903e95

Browse files
change sequence of modifying file
1 parent 74511aa commit 7903e95

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

travis-ci/changefile.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,13 @@ git remote -v
2222
git config --global user.email "${GIT_EMAIL}"
2323
git config --global user.name "${GIT_NAME}"
2424
git config --global push.default simple
25+
git checkout master
2526
#export GIT_TAG=V2.$YEAR-$MONTH.$TRAVIS_BUILD_NUMBER
2627
#msg="Tag Generated from TravisCI for build $TRAVIS_BUILD_NUMBER"
2728
#echo "$msg" >> $TRAVIS_BUILD_DIR/build.txt
28-
#sudo $TRAVIS_BUILD_DIR/travis-ci/modify-globalblacklist.sh
29-
#sudo git add $TRAVIS_BUILD_DIR/globalblacklist.conf
29+
sudo $TRAVIS_BUILD_DIR/travis-ci/modify-globalblacklist.sh
30+
sudo chown travis:travis $TRAVIS_BUILD_DIR/globalblacklist.conf
31+
sudo git add $TRAVIS_BUILD_DIR/globalblacklist.conf
3032
#git add -A .
3133
#git add $TRAVIS_BUILD_DIR/build.txt
3234
#git commit -m "Update build version file with $TRAVIS_BUILD_NUMBER"

travis-ci/deploy2.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ 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
8-
git config --global user.email "${GIT_EMAIL}"
9-
git config --global user.name "${GIT_NAME}"
10-
git config --global push.default simple
7+
#git checkout master
8+
#git config --global user.email "${GIT_EMAIL}"
9+
#git config --global user.name "${GIT_NAME}"
10+
#git config --global push.default simple
1111
git status
1212
#git fetch origin master
1313
#git diff origin/master
@@ -18,9 +18,9 @@ git status
1818
#git fetch --tags
1919
msg="Tag $GIT_TAG Generated from TravisCI for build $TRAVIS_BUILD_NUMBER"
2020
#if git tag $GIT_TAG -a -m "$msg" 2>/dev/null; then
21-
sudo $TRAVIS_BUILD_DIR/travis-ci/modify-globalblacklist.sh
22-
sudo chown travis:travis $TRAVIS_BUILD_DIR/globalblacklist.conf
23-
git add $TRAVIS_BUILD_DIR/globalblacklist.conf
21+
#sudo $TRAVIS_BUILD_DIR/travis-ci/modify-globalblacklist.sh
22+
#sudo chown travis:travis $TRAVIS_BUILD_DIR/globalblacklist.conf
23+
#git add $TRAVIS_BUILD_DIR/globalblacklist.conf
2424
#git add .
2525
#git add $TRAVIS_BUILD_DIR/build.txt
2626
export GIT_TAG=V2.$YEAR-$MONTH.$TRAVIS_BUILD_NUMBER

0 commit comments

Comments
 (0)