Skip to content

Commit 390cb6d

Browse files
construct GIT_TAG inside modify script
1 parent dcb665e commit 390cb6d

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ before_deploy:
4242
#- git config --global user.email "${GIT_EMAIL}"
4343
#- git config --global user.name "${GIT_NAME}"
4444
#- git config --global push.default simple
45-
#- export GIT_TAG=v1.0.$TRAVIS_BUILD_NUMBER
45+
- export GIT_TAG=v1.0.$TRAVIS_BUILD_NUMBER
4646
#- sudo $TRAVIS_BUILD_DIR/travis-ci/modify-globalblacklist.sh
4747
#- cat $TRAVIS_BUILD_DIR/globalblacklist.conf
4848
#- git commit -am "Travis Test Passed"

travis-ci/install-nginx2.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ cd /usr/sbin
8484
sudo ./update-ngxblocker
8585
sudo service nginx reload
8686
sudo chmod +x $TRAVIS_BUILD_DIR/travis-ci/modify-globalblacklist.sh
87-
sudo export GIT_TAG=v1.0.$TRAVIS_BUILD_NUMBER
87+
#sudo export GIT_TAG=v1.0.$TRAVIS_BUILD_NUMBER
8888
sudo $TRAVIS_BUILD_DIR/travis-ci/modify-globalblacklist.sh
8989
cat $TRAVIS_BUILD_DIR/globalblacklist.conf
9090
#sudo sed --version

travis-ci/modify-globalblacklist.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
# Start time of script generation
77
start=$(date +%s.%N)
8+
MY_GIT_TAG=v1.0.$TRAVIS_BUILD_NUMBER
89

910
# Temporary database files we create
1011
_inputdbA=/tmp/lastupdated.db
@@ -27,7 +28,7 @@ LASTUPDATEIFS=$IFS
2728
IFS=$'\n'
2829
now="$(date)"
2930
echo $_startdate >> $_tmpnginxA
30-
printf "### Updated: "$now"\n### Build: "$GIT_TAG"\n" >> $_tmpnginxA
31+
printf "### Updated: "$now"\n### Build: "$MY_GIT_TAG"\n" >> $_tmpnginxA
3132
echo $_enddate >> $_tmpnginxA
3233
IFS=$LASTUPDATEIFS
3334
mv $_tmpnginxA $_inputdbA

0 commit comments

Comments
 (0)