diff --git a/plasma/VERSIONS-normal.inc b/plasma/VERSIONS-normal.inc index ef2cc26..3e33691 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.19 OLD_VERSION=5.18.5 ORIGIN=trunk # git branch as set in projects.k.o, set to trunk or stable or lts 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/ +INFOCHECKOUT="/home/jr/src/www/www/info" # git@invent.kde.org:websites/kde-org.git +ANNOUNCECHECKOUT="/home/jr/src/www/kde-org/announcements" # git@invent.kde.org:websites/kde-org.git +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/kde-org" # git@invent.kde.org:websites/kde-org.git 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-release b/plasma/plasma-release index b85bfa4..6522870 100755 --- a/plasma/plasma-release +++ b/plasma/plasma-release @@ -1,73 +1,66 @@ #!/bin/bash set -xe . VERSIONS.inc sudo apt install w3m ssh $UPLOADSERVER "chmod 755 ${FTPSTABLE}/plasma/${VERSION}" # remove non-release notice in www/announcements/plasma-5.x.y.php and www/info/plasma-5.x.y.php sed -i "/NOT OUT YET/d" ${ANNOUNCECHECKOUT}/plasma-${VERSION}.php sed -i "/NOT OUT YET/d" ${INFOCHECKOUT}/plasma-${VERSION}.php # www/announcements/index.php ANNOUNCEINDEX="<\!-- Plasma ${VERSION} -->\n${RELEASEDATE}<\/strong> - Plasma ${VERSION}<\/a>\n
\n\"KDE Ships Plasma ${VERSION}.<\/em>\"\n

" sed -i "s/\(INSERT NEW ENTRIES.*\)/\1\n${ANNOUNCEINDEX}/" ${ANNOUNCECHECKOUT}/index.php # www/index.php # Updating www/index.php got ported to Ruby ./plasma-release-webpages -# commit to svn -pushd ${ANNOUNCECHECKOUT} -svn diff -svn commit -m "release plasma ${VERSION}" - -cd ${INFOCHECKOUT} -svn diff -svn commit -m "release plasma ${VERSION}" - +# commit to git cd ${WWWCHECKOUT} -svn diff -svn commit -m "release plasma ${VERSION}" +git diff +git commit -a -m "release plasma ${VERSION}" +git push # copy announce over to Dot for publishing popd firefox https://www.kde.org/info/plasma-${VERSION} firefox https://www.kde.org/announcements/plasma-${VERSION} firefox https://www.kde.org/announcements/ firefox https://www.kde.org/ firefox https://binary-factory.kde.org/view/Websites/job/Website_kde-org/ rm -rf tmp-announcements mkdir tmp-announcements ./plasma-dot-story -v ${VERSION} > tmp-announcements/DOT-STORY.html kate tmp-announcements/DOT-STORY.html w3m tmp-announcements/DOT-STORY.html -dump > tmp-announcements/KDE-ANNOUNCE_TEXT.txt sed -i "s,Live Images.*,https://www.kde.org/announcements/plasma-${VERSION}.php\nhttps://www.kde.org/announcements/plasma-${OLD_VERSION}-${VERSION}-changelog.php," tmp-announcements/KDE-ANNOUNCE_TEXT.txt echo "e-mail me to kde-announce@kde.org" > tmp-announcements/KDE-ANNOUNCE_TEXT2.txt cat tmp-announcements/KDE-ANNOUNCE_TEXT.txt >> tmp-announcements/KDE-ANNOUNCE_TEXT2.txt kate tmp-announcements/KDE-ANNOUNCE_TEXT2.txt # post on twitter, g+, facebook, reddit (r/kde and r/linux) echo "@kdecommunity releases Plasma ${VERSION} to fix your bugs https://www.kde.org/announcements/plasma-${VERSION}.php" > tmp-announcements/twitter.text kate tmp-announcements/twitter.text firefox https://tweetdeck.twitter.com firefox https://facebook.com/kde firefox https://mastodon.technology/ firefox https://www.reddit.com/r/kde/submit firefox https://dot.kde.org/#overlay=node/add/story # e-mail release-team@kde.org, plasma-devel@kde.org with the happy news echo "e-mail me to kde-announce@kde.org, release-team@kde.org, plasma-devel@kde.org" > tmp-announcements/release-team echo "Plasma ${VERSION} is now released https://www.kde.org/announcements/plasma-${VERSION}.php" >> tmp-announcements/release-team kate tmp-announcements/release-team diff --git a/plasma/plasma-webpages b/plasma/plasma-webpages index 60d9135..1078acf 100755 --- a/plasma/plasma-webpages +++ b/plasma/plasma-webpages @@ -1,49 +1,49 @@ #!/usr/bin/env ruby # Copyright (C) 2020 Carl Schwan 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 # 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)) # Change work branch system('git', 'checkout', 'master', chdir: plasma_versions.wwwcheckout) -system('git', 'checkout', '-b', "work/plasma-#{version}", chdir: plasma_versions.wwwcheckout) +system('git', 'checkout', "work/announcements", chdir: plasma_versions.wwwcheckout) # Add files system('git', 'add', "info/plasma-#{version}.php", chdir: plasma_versions.wwwcheckout) # info file system('git', 'add', "announcements/#{changelog_file}", chdir: plasma_versions.wwwcheckout) # changelog file system('git', 'add', "announcements/plasma-#{version}.php", chdir: plasma_versions.wwwcheckout, unless version[-2..-1] == "90" or version[-2..-1] == "80") # Commit files system('git', 'commit', '-m', "feat: Add webpage for Plasma #{version}", chdir: plasma_versions.wwwcheckout) # And push files :) -system('git', 'push', '-u', "origin work/plasma-#{version}", chdir: plasma_versions.wwwcheckout) -system('xdg-open', "https://invent.kde.org/websites/kde-org/-/merge_requests/new?merge_request%5Bsource_branch%5D=work%2Fplasma-#{version}") +system('git', 'push', chdir: plasma_versions.wwwcheckout) +system('xdg-open', "https://www-staging.kde.org/announcements/plasma-#{version}?letmein=1") # I18N data 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)