Skip to content

Commit

Permalink
* release.pl: verify upfront that non-rc splash is available on 1. point
Browse files Browse the repository at this point in the history
release and ltr splash on .4 point release of a ltr branch
* fix splash (rc->non-rc)
  • Loading branch information
jef-n committed Mar 31, 2023
1 parent 9035a01 commit 447e8d7
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 4 deletions.
Binary file modified images/splash/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 25 additions & 4 deletions scripts/release.pl
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,13 @@ ($$)

my $splashwidth;
unless( defined $dopoint ) {
pod2usage("Splash images/splash/splash-$newmajor.$newminor.png not found") unless -r "images/splash/splash-$newmajor.$newminor.png";
pod2usage("Splash images/splash/splash-${newmajor}.${newminor}rc.png not found") unless -r "images/splash/splash-${newmajor}.${newminor}rc.png";
} elsif($newpatch == 1) {
pod2usage("Splash images/splash/splash-${newmajor}.${newminor}.png not found") unless -r "images/splash/splash-${newmajor}.${newminor}.png";
} elsif($newpatch == 4) { # TODO handle EPRs
if( system("git tag -l | grep -q '^ltr-${newmajor}_${newminor}$'") == 0) {
pod2usage("Splash images/splash/splash-${newmajor}.${newminor}ltr.png not found") unless -r "images/splash/splash-${newmajor}.${newminor}ltr.png";
}
}

print "Last pull rebase...\n";
Expand Down Expand Up @@ -180,11 +186,18 @@ ($$)
unless( defined $dopoint ) {
run( "perl -i -pe 's/qgis-dev-deps/qgis-ltr-deps/;' INSTALL.md", "could not update osgeo4w deps package" ) if $doltr;
run( "perl -i -pe 's/qgis-dev-deps/qgis-rel-deps/;' INSTALL.md", "could not update osgeo4w deps package" ) unless $doltr;
run( "cp -v images/splash/splash-$newmajor.$newminor.png images/splash/splash.png", "splash png switch failed" );
run( "cp -v images/splash/splash-${newmajor}.${newminor}rc.png images/splash/splash.png", "splash png switch failed" );
run( "git commit -n -a -m \"Release of $release ($newreleasename)\"", "release commit failed" );
run( "git tag $reltag -m 'Version $release'", "release tag failed" );
run( "for i in \$(seq 20); do tx push -s --branch $relbranch && exit 0; echo \"Retry \$i/20...\"; done; exit 1", "push translation for $relbranch branch" );
} else {
if($newpatch == 1) {
run( "cp -v images/splash/splash-${newmajor}.${newminor}.png images/splash/splash.png", "splash png switch failed" );
} elsif($newpatch == 4) { # TODO handle EPRs
if( system("git tag -l | grep -q '^ltr-${newmajor}_${newminor}$'") == 0) {
run( "cp -v images/splash/splash-${newmajor}.${newminor}ltr.png images/splash/splash.png", "splash png switch failed" );
}
}
run( "git commit -n -a -m 'Release of $version'", "release commit failed" );
run( "git tag $reltag -m 'Version $version'", "tag failed" );
}
Expand Down Expand Up @@ -218,7 +231,7 @@ ($$)
$newminor=99;
}

run( "perl -i -pe \"s#Earlier versions of the documentation are also available on the QGIS website:#\$&\\n<a href=\\\"https://qgis.org/api/$apiv\\\">$apiv" . ($doltr ? " (LTR)" : "") . "</a>#\" doc/index.dox", "index.dox update failed");
run( "perl -i -pe \"s#Earlier versions of the documentation are also available on the QGIS website:#\$&\\n<a href=\\\"https://qgis.org/api/$apiv\\\">$apiv" . ($doltr ? " (LTR)" : "") . "</a>,#\" doc/index.dox", "index.dox update failed");

updateCMakeLists($newmajor,$newminor,0,"Master");
run( "cp /tmp/changelog debian", "restore changelog failed" );
Expand Down Expand Up @@ -263,7 +276,15 @@ =head1 SYNOPSIS
a major release
Major and minor releases also require a new splash screen
images/splash/splash-M.N.png.
images/splash/splash-M.Nrc.png, which should have a label
"release candidate".
The first point release also requires a new splash screen
images/splash/splash-M.N.png without that label.
The fourth point release of a ltr branch requires a new splash screen
images/splash/splash-M.Nltr.png with the label "long-term
release".
A pre-major minor release also produces a second branch
master_$currentmajor to allow more interim minor releases
Expand Down

0 comments on commit 447e8d7

Please sign in to comment.