From 4c5ee3b53abf424e557e9560419b40bf3e733faa Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 18 Jan 2022 13:20:49 +0100 Subject: [PATCH] Changes: post-release housekeeping - update the automatically-selected GPG signing-key --- CHANGES-3.2 | 12 ++++++++++++ CMakeLists.txt | 4 ++-- ci/RELEASE.sh | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/CHANGES-3.2 b/CHANGES-3.2 index d574dba0e..8cf5c0761 100644 --- a/CHANGES-3.2 +++ b/CHANGES-3.2 @@ -7,6 +7,18 @@ contributors are listed. Note that Calamares does not have a historical changelog -- this log starts with version 3.2.0. The release notes on the website will have to do for older versions. +# 3.2.51 (unreleased) # + +This release contains contributions from (alphabetically by first name): + - No external contributors yet + +## Core ## + - No core changes yet + +## Modules ## + - No module changes yet + + # 3.2.50 (2022-01-18) # This release contains contributions from (alphabetically by first name): diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f893c65e..aec04f315 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,11 +41,11 @@ # TODO:3.3: Require CMake 3.12 cmake_minimum_required( VERSION 3.3 FATAL_ERROR ) project( CALAMARES - VERSION 3.2.50 + VERSION 3.2.51 LANGUAGES C CXX ) -set( CALAMARES_VERSION_RC 0 ) # Set to 0 during release cycle, 1 during development +set( CALAMARES_VERSION_RC 1 ) # Set to 0 during release cycle, 1 during development if( CALAMARES_VERSION_RC EQUAL 1 AND CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR ) message( FATAL_ERROR "Do not build development versions in the source-directory." ) endif() diff --git a/ci/RELEASE.sh b/ci/RELEASE.sh index f09285fb7..e46ca2cc2 100755 --- a/ci/RELEASE.sh +++ b/ci/RELEASE.sh @@ -75,7 +75,7 @@ fi # # BUILDDIR=$(mktemp -d --suffix=-build --tmpdir=.) -KEY_ID="CFDDC96F12B1915C" +KEY_ID="328D742D8807A435" # Try to make gpg cache the signing key, so we can leave the process # to run and sign.