diff --git a/plasma/VERSIONS.inc b/plasma/VERSIONS.inc index 1b548f3..fbedbbe 100644 --- a/plasma/VERSIONS.inc +++ b/plasma/VERSIONS.inc @@ -1,33 +1,33 @@ -LANG=en_US.UTF-8 +LANG=en_GB.UTF-8 LANGUAGE=en -LC_ALL=en_US.UTF-8 +LC_ALL=en_GB.UTF-8 VERSION=5.13.2 SHORT_VERSION=5.13 OLD_VERSION=5.13.1 ORIGIN=stable # git branch as set in projects.k.o, set to trunk or stable FTPSTABLE=stable # set to unstable or stable OLD_FTPSTABLE=stable # set to unstable or stable of previous release BRANCH=Plasma/5.13 # set to master or Plasma/5.x MINOR_RELEASE_MONTH=June # 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-kde4/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@racnoss.kde.org" #UPLOADSERVER="weegie" PLASMA_CLONES="/home/jr/src/kde/" # a directory containing khotkeys/neongit/khotkeys/ etc for each repo RELEASEDATE="Tuesday, 26 June 2018" # usually `LC_ALL=C date "+%A, %d %B %Y" --date="next Tue"` RELEASEMONTH="June" # usually `LC_ALL=C date "+%B" --date="next Tue"` TIMESINCELASTRELEASE="week's" # in sentence 'This release adds a TIMESINCELASTRELEASE worth of new' SCRATCH_SERVER=embra:tmp/ # somewhere to scp QA and tag files to YOUTUBEID="xha6DJ_v1E4" # The video ID used in URL for youtube GPG_KEY=0xEC94D18F7F05997E RELEASE_DUDE="Jonathan Riddell" diff --git a/plasma/lib/plasma-tag-test.rb b/plasma/lib/plasma-tag-test.rb index fa3fe7f..33d36cd 100755 --- a/plasma/lib/plasma-tag-test.rb +++ b/plasma/lib/plasma-tag-test.rb @@ -1,42 +1,42 @@ #!/usr/bin/env ruby require_relative 'plasma_version' require 'git' # check the tag has been pushed class PlasmaTagTest attr_accessor :version attr_accessor :repos def initialize plasma_versions = PlasmaVersion.new @version = plasma_versions.version Dir.chdir(plasma_versions.plasma_clones) - @version = '5.13.1' + @version = '5.13.2' end def grab_git_repos file_contents = File.read( \ '/home/jr/src/releaseme/releaseme/plasma/git-repositories-for-release' \ ) @repos = file_contents.split(' ') discover = @repos.find_index('discover') @repos[discover] = 'plasma-discover' end def check_tags repos.each do |repo| Dir.chdir(repo + '/kdegit/' + repo) do found = false system('git fetch --tags') git = Git.open('.') git.tags.each do |tag| found = true if tag.name == "v#{@version}" end puts "Not found #{repo}" if found == false exit 0 if found == false end end puts 'All good!' end end diff --git a/plasma/plasma-tag-test-test b/plasma/plasma-tag-test-test index 5402b60..cdadfa2 100755 --- a/plasma/plasma-tag-test-test +++ b/plasma/plasma-tag-test-test @@ -1,25 +1,25 @@ #!/usr/bin/env ruby require 'test/unit' require_relative 'lib/plasma-tag-test' class PlasmaTagTestTest < Test::Unit::TestCase def setup @tagTest = PlasmaTagTest.new end # def teardown # end def test_version - assert_equal '5.13.1', @tagTest.version, 'Version not set.' + assert_equal '5.13.2', @tagTest.version, 'Version not set.' end def test_git_repos @tagTest.grab_git_repos assert_equal ['bluedevil', 'breeze', 'breeze-grub'], @tagTest.repos[0..2] assert_equal 'xdg-desktop-portal-kde', @tagTest.repos[-1] assert_equal nil, @tagTest.repos.find_index('discover') assert_equal 5, @tagTest.repos.find_index('plasma-discover') end end diff --git a/plasma/plasma-update-versions b/plasma/plasma-update-versions index 0cd91f6..b2a6282 100755 --- a/plasma/plasma-update-versions +++ b/plasma/plasma-update-versions @@ -1,32 +1,32 @@ # Quick script to update version numbers in Plasma 5 modules # does a clone, replaces PROJECT_VERSION in CMakeLists.txt and pushes # Author Jonathan Riddell 2014, this file is in the public domain and has no copyright restrictions set -xe . VERSIONS.inc # echo for updating version in master after branch override versions here -VERSION=5.13.80 +# VERSION=5.13.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 projectrepo=$project project=`basename $project` if [ $project != "breeze-grub" ]; then echo ${project}; git clone --depth 1 --branch ${BRANCH} kde:${projectrepo} ${project}; cd ${project}; pwd; sed -i "s,PROJECT_VERSION \".*\",PROJECT_VERSION \"${VERSION}\"," CMakeLists.txt; git diff; git commit -a -m "Update version number for ${VERSION} GIT_SILENT" || true; git push; cd ..; fi done