File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -12,6 +12,7 @@ travisDir=.travis
1212travisConfig=.travis.yml
1313travisBuildScript=$travisDir /build.sh
1414travisSettingsFile=$travisDir /settings.xml
15+ travisNotifyScript=$travisDir /notify.sh
1516credentialsDir=$HOME /.scijava/credentials
1617varsFile=$credentialsDir /vars
1718signingKeySourceFile=$credentialsDir /scijava-ci-signing.asc
@@ -114,12 +115,10 @@ EOL
114115 update " $travisBuildScript "
115116
116117 # Remove obsolete Travis-related files.
117- if [ -f " $travisSettingsFile " ]
118- then
119- info " Removing obsolete $travisSettingsFile (travis-build.sh generates it now)."
120- $EXEC git rm -f " $travisSettingsFile "
121- $EXEC git ci -m " Travis: remove obsolete $travisSettingsFile "
122- fi
118+ test -f " $travisSettingsFile " && info " Removing obsolete $travisSettingsFile (travis-build.sh generates it now)"
119+ test -f " $travisNotifyScript " && info " Removing obsolete $travisNotifyScript (ImageJ Jenkins is going away)"
120+ $EXEC git rm -f " $travisSettingsFile " " $travisNotifyScript "
121+ $EXEC git diff-index --quiet HEAD -- || $EXEC git ci -m " Travis: remove obsolete files"
123122
124123 # Upgrade version of pom-scijava.
125124 version=$( xmllint --xpath " //*[local-name()='project']/*[local-name()='parent']/*[local-name()='version']" pom.xml| sed ' s/[^>]*>//' | sed ' s/<.*//' )
You can’t perform that action at this time.
0 commit comments