Skip to content

Commit a9bb401

Browse files
committed
travisify.sh: also remove .travis/notify.sh
It was never used for anything real. The ImageJ Jenkins, which is going to be retired soon, does not need to know when a Travis build happens.
1 parent 12d1551 commit a9bb401

1 file changed

Lines changed: 5 additions & 6 deletions

File tree

travisify.sh

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ travisDir=.travis
1212
travisConfig=.travis.yml
1313
travisBuildScript=$travisDir/build.sh
1414
travisSettingsFile=$travisDir/settings.xml
15+
travisNotifyScript=$travisDir/notify.sh
1516
credentialsDir=$HOME/.scijava/credentials
1617
varsFile=$credentialsDir/vars
1718
signingKeySourceFile=$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/<.*//')

0 commit comments

Comments
 (0)