Skip to content

Commit f60e917

Browse files
committedFeb 24, 2017
release.pl: bypass pre-commit hooks
1 parent d9f9c9d commit f60e917

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed
 

‎scripts/release.pl

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ ($$)
146146
print "Pulling transifex translations...\n";
147147
run( "scripts/pull_ts.sh", "pull_ts.sh failed" );
148148
run( "git add i18n/*.ts", "adding translations failed" );
149-
run( "git commit -a -m \"translation update for $release from transifex\"", "could not commit translation updates" );
149+
run( "git commit -n -a -m \"translation update for $release from transifex\"", "could not commit translation updates" );
150150
}
151151

152152
print "Updating changelog...\n";
@@ -155,7 +155,7 @@ ($$)
155155
unless( $dopoint ) {
156156
run( "scripts/update-news.pl $newmajor $newminor '$release'", "could not update news" ) if $major>2 || ($major==2 && $minor>14);
157157

158-
run( "git commit -a -m \"changelog and news update for $release\"", "could not commit changelog and news update" );
158+
run( "git commit -n -a -m \"changelog and news update for $release\"", "could not commit changelog and news update" );
159159

160160
print "Creating and checking out branch...\n";
161161
run( "git checkout -b $relbranch", "git checkout release branch failed" );
@@ -178,11 +178,11 @@ ($$)
178178
print "WARNING: NO images/splash/splash-release.xcf.bz2\n";
179179
}
180180

181-
run( "git commit -a -m 'Release of $release ($newreleasename)'", "release commit failed" );
181+
run( "git commit -n -a -m 'Release of $release ($newreleasename)'", "release commit failed" );
182182
run( "git tag $reltag -m 'Version $release'", "release tag failed" );
183183
run( "git tag $ltrtag -m 'Long term release $release'", "ltr tag failed" ) if $doltr;
184184
} else {
185-
run( "git commit -a -m 'Release of $version'", "release commit failed" );
185+
run( "git commit -n -a -m 'Release of $version'", "release commit failed" );
186186
run( "git tag $reltag -m 'Version $version'", "tag failed" );
187187
}
188188

@@ -195,18 +195,19 @@ ($$)
195195

196196
print "Updating master...\n";
197197
run( "git checkout master", "checkout master failed" );
198+
198199
updateCMakeLists($newmajor,$newminor,0,"Master");
199200
run( "cp /tmp/changelog debian", "restore changelog failed" );
200201
run( "dch -r ''", "dch failed" );
201202
run( "dch --newversion $newmajor.$newminor.0 'New development version $newmajor.$newminor after branch of $release'", "dch failed" );
202-
run( "git commit -a -m 'Bump version to $newmajor.$newminor'", "bump version failed" );
203+
run( "git commit -n -a -m 'Bump version to $newmajor.$newminor'", "bump version failed" );
203204
}
204205

205206
my $topush = ($dopoint ? "" : "master ") . "$relbranch";
206207

207208
print "Push dry-run...\n";
208209
run( "git push -n --follow-tags origin $topush", "push dry run failed" );
209-
print "Now manually push and upload the tarballs :\n\tgit push --follow-tags origin $topush\n\trsync qgis-$version.tar.bz2* qgis.org:/var/www/downloads/\n\n";
210+
print "Now manually push and upload the tarballs :\n\tgit push --follow-tags origin $topush\n\trsync qgis-$version.tar.bz2* ssh.qgis.org:/var/www/downloads/\n\n";
210211

211212

212213
=head1 NAME

0 commit comments

Comments
 (0)
Please sign in to comment.