diff --git a/plasma/plasma-webpages b/plasma/plasma-webpages index 2ce097e..60d9135 100755 --- a/plasma/plasma-webpages +++ b/plasma/plasma-webpages @@ -1,42 +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)) -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) 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") +# Change work branch +system('git', 'checkout', 'master', chdir: plasma_versions.wwwcheckout) +system('git', 'checkout', '-b', "work/plasma-#{version}", 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}") + +# 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) diff --git a/plasma/update-web-svn b/plasma/update-web-svn index 663ba94..a4efbd1 100755 --- a/plasma/update-web-svn +++ b/plasma/update-web-svn @@ -1,19 +1,14 @@ #!/bin/bash # checkout/update web svn bits for announcement set -xe . VERSIONS.inc -cd ${INFOCHECKOUT} -svn update - -cd ${ANNOUNCECHECKOUT} -svn update - cd ${L10NSCRIPTSCHECKOUT} svn update cd ${WWWCHECKOUT} -svn update +git checkout master +git pull