diff --git a/plasma/VERSIONS-normal.inc b/plasma/VERSIONS-normal.inc index ea321b6..ef2cc26 100644 --- a/plasma/VERSIONS-normal.inc +++ b/plasma/VERSIONS-normal.inc @@ -1,35 +1,35 @@ LANG=en_GB.UTF-8 LANGUAGE=en LC_ALL=en_GB.UTF-8 VERSION=5.18.90 -SHORT_VERSION=5.18 +SHORT_VERSION=5.19 OLD_VERSION=5.18.5 ORIGIN=trunk # git branch as set in projects.k.o, set to trunk or stable or lts -FTPSTABLE=stable # set to unstable or stable +FTPSTABLE=unstable # set to unstable or stable OLD_FTPSTABLE=stable # set to unstable or stable of previous release BRANCH=master # set to master or Plasma/5.x MINOR_RELEASE_MONTH="May 2020" # for announcement, when was 5.x.0 released RELEASETYPE=bugfix # for changelog, set to beta, feature or bugfix INFOCHECKOUT="/home/jr/src/www/www/info" # svn+ssh://svn@svn.kde.org/home/kde/trunk/www/sites/www/info/ ANNOUNCECHECKOUT="/home/jr/src/www/www/announcements" # svn+ssh://svn@svn.kde.org/home/kde/trunk/www/sites/www/announcements/ L10NSCRIPTSCHECKOUT="/home/jr/src/www/l10n-kf5/scripts" # svn+ssh://svn@svn.kde.org/home/kde/trunk/l10n-kde4/scripts/ WWWCHECKOUT="/home/jr/src/www/www" # svn+ssh://svn@svn.kde.org/home/kde/trunk/www/sites/www/ UPLOADSERVER="ftpadmin@master.kde.org" #UPLOADSERVER="weegie" RELEASEDATE="Thursday, 14 May 2020" # usually `LC_ALL=C date "+%A, %d %B %Y" --date="next Tue"` RELEASEMONTH="May" # usually `LC_ALL=C date "+%B" --date="next Tue"` TIMESINCELASTRELEASE="a month's" # in sentence 'This release adds TIMESINCELASTRELEASE worth of new' SCRATCH_SERVER=embra:tmp/ # somewhere to scp QA and tag files to YOUTUBEID="https://peertube.mastodon.host/videos/embed/cda402b5-2bcb-4c0c-b232-0fa5a4dacaf5" # The video ID used in URL for youtube # command from git clone kde:jriddell/appstream-metainfo-release-update APPSTREAM_UPDATER="/home/jr/src/appstream-metainfo-release-update/appstream-metainfo-release-update/appstream-metainfo-release-update" GPG_KEY=0xEC94D18F7F05997E RELEASE_DUDE="Jonathan Riddell" diff --git a/plasma/plasma-update-versions b/plasma/plasma-update-versions index 59fb9fe..09b6c5f 100755 --- a/plasma/plasma-update-versions +++ b/plasma/plasma-update-versions @@ -1,57 +1,57 @@ # Quick script to update version numbers in Plasma 5 modules # does a clone, replaces PROJECT_VERSION in CMakeLists.txt and pushes # Also updates Appstream metadata files with new version and date # Author Jonathan Riddell 2014,2019, this file is in the public domain and has no copyright restrictions set -xe pwd ls . ./VERSIONS.inc # echo for updating version in master after branch override versions here -#VERSION=5.18.80 +#VERSION=5.19.80 WORKSPACE=`cat git-repositories-for-release` echo "updating versions for $WORKSPACE" rm -rf tmp-version-update mkdir tmp-version-update cd tmp-version-update for project in $WORKSPACE; do GITPREFIX="kde:" if [ $project == "breeze-gtk" ]; then GITPREFIX="invent:kde/" fi projectrepo=$project project=`basename $project` if [ $project != "breeze-grub" ]; then echo ${project}; git clone --depth 1 --no-single-branch ${GITPREFIX}${projectrepo} ${project}; cd ${project}; pwd; git checkout ${BRANCH} sed -i "s,PROJECT_VERSION \".*\",PROJECT_VERSION \"${VERSION}\"," CMakeLists.txt; # update appstream files release version unless we are doing a beta if [ ! $ORIGIN == 'trunk' ]; then for metainfofile in `find . -name \*appdata.xml -o -name \*metainfo.xml`; do ${APPSTREAM_UPDATER} ${metainfofile} --version "${VERSION}" --datestring "${RELEASEDATE}" --releases-to-show 4 done fi git diff; git commit -a -m "Update version number for ${VERSION} GIT_SILENT" || true; git push; # push to master if [ ! $ORIGIN == 'trunk' ]; then git checkout master for metainfofile in `find . -name \*appdata.xml -o -name \*metainfo.xml`; do ${APPSTREAM_UPDATER} ${metainfofile} --version "${VERSION}" --datestring "${RELEASEDATE}" --releases-to-show 4 done git commit -a -m "Update version number for ${VERSION} GIT_SILENT" || true; git push; fi cd ..; fi done diff --git a/plasma/plasma-webpages b/plasma/plasma-webpages index 060bf97..2ce097e 100755 --- a/plasma/plasma-webpages +++ b/plasma/plasma-webpages @@ -1,41 +1,42 @@ #!/usr/bin/env ruby require 'fileutils' require_relative 'lib/plasma_info_template' require_relative 'lib/plasma_announce_template' require_relative 'lib/plasma_version' plasma_versions = PlasmaVersion.new version = plasma_versions.version info_template = PlasmaInfoTemplate.new info_output = info_template.render File.write(format('%s/plasma-%s.php', plasma_versions.infocheckout, version), info_output) announce_template = PlasmaAnnounceTemplate.new announce_output = announce_template.render -File.write(format('%s/plasma-%s.php', plasma_versions.announcecheckout, version), announce_output) +# write announcement unless it's a beta or final where we do it manually +File.write(format('%s/plasma-%s.php', plasma_versions.announcecheckout, version), announce_output) unless version[-2..-1] == "90" or version[-2..-1] == "80" changelog_file = format('plasma-%s-%s-changelog.php', plasma_versions.old_version, version) FileUtils.cp(changelog_file, format('%s/%s', plasma_versions.announcecheckout, changelog_file)) system('svn', 'add', changelog_file, chdir: plasma_versions.announcecheckout) system('svn', 'add', "plasma-#{version}.php", chdir: plasma_versions.infocheckout) system('svn', 'commit', '-m', "start webpages for Plasma #{version}", chdir: plasma_versions.infocheckout) -system('svn', 'add', "plasma-#{version}.php", chdir: plasma_versions.announcecheckout) +system('svn', 'add', "plasma-#{version}.php", chdir: plasma_versions.announcecheckout) unless version[-2..-1] == "90" or version[-2..-1] == "80" system('svn', 'commit', '-m', "start webpages for Plasma #{version}", chdir: plasma_versions.announcecheckout) system('firefox', "https://www.kde.org/announcements/plasma-#{version}.php") system('firefox', "https://www.kde.org/announcements/plasma-#{plasma_versions.old_version}-#{version}-changelog.php") system('firefox', "https://www.kde.org/info/plasma-#{version}.php") system('sed', "s,release_files\\[\"plasma-#{plasma_versions.old_version}\"\] = \\[\"plasma-#{plasma_versions.old_version}.php\"\],release_files[\"plasma-#{plasma_versions.old_version}\"] = [\"plasma-#{plasma_versions.old_version}.php\"]\\n release_files[\"plasma-#{version}\"] = [\"plasma-#{version}.php\"],", "generate_release_data.py", "-i", chdir: plasma_versions.l10nscriptscheckout) system('svn', 'diff', chdir: plasma_versions.l10nscriptscheckout) system('svn', 'commit', '-m', "add Plasma #{version} announcement", chdir: plasma_versions.l10nscriptscheckout)