From 218174722c094c3e9fcfdba59cf212e8c18f2a7a Mon Sep 17 00:00:00 2001 From: CoreOS Bot Date: Mon, 22 Jan 2024 11:55:46 +0000 Subject: [PATCH] =?UTF-8?q?Sync=20repo=20templates=20=E2=9A=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sync with coreos/repo-templates@b7fb8e151edaccc5250d5604bf4e082ed21bebef. --- .github/ISSUE_TEMPLATE/release-checklist.md | 6 +++--- signing-ticket.sh | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/release-checklist.md b/.github/ISSUE_TEMPLATE/release-checklist.md index 5ec6f11b..ff5bb734 100644 --- a/.github/ISSUE_TEMPLATE/release-checklist.md +++ b/.github/ISSUE_TEMPLATE/release-checklist.md @@ -25,13 +25,13 @@ Fedora packaging: - [ ] Run `kinit your_fas_account@FEDORAPROJECT.ORG` - [ ] Run `fedpkg new-sources $(spectool -S butane.spec | sed 's:.*/::')` - [ ] PR the changes in [Fedora](https://src.fedoraproject.org/rpms/butane) - - [ ] Once the PR merges to rawhide, merge rawhide into the other relevant branches (e.g. f38) then push those, for example: + - [ ] Once the PR merges to rawhide, merge rawhide into the other relevant branches (e.g. f39) then push those, for example: ```bash git checkout rawhide git pull --ff-only - git checkout f38 + git checkout f39 git merge --ff-only rawhide - git push origin f38 + git push origin f39 ``` - [ ] On each of those branches run `fedpkg build` including rawhide. - [ ] Once the builds have finished, submit them to [bodhi](https://bodhi.fedoraproject.org/updates/new), filling in: diff --git a/signing-ticket.sh b/signing-ticket.sh index 16cda7b7..279a7ff2 100755 --- a/signing-ticket.sh +++ b/signing-ticket.sh @@ -15,11 +15,11 @@ make_script() { #!/bin/bash set -eux -o pipefail -# Use the Fedora 38 key for the detached signatures -KEYTOSIGNWITH='fedora-38' +# Use the Fedora 39 key for the detached signatures +KEYTOSIGNWITH='fedora-39' -VR='@@VERSION@@-@@RELEASE@@.fc38' -RPMKEY='eb10b464' # Fedora 38 key +VR='@@VERSION@@-@@RELEASE@@.fc39' +RPMKEY='18b8e74c' # Fedora 39 key do_sign() { # Sign with sigul unless FAKESIGN=1