From 186cbfe17ec673b81cf67ba4c1b06d26b8aac9d0 Mon Sep 17 00:00:00 2001 From: CoreOS Bot Date: Fri, 18 Nov 2022 19:23:14 +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@285b422243c53e27b4358a2f45ad89af5fe91754. --- .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 c3310e01..b1c3fbf6 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. f36) then push those, for example: + - [ ] Once the PR merges to rawhide, merge rawhide into the other relevant branches (e.g. f37) then push those, for example: ```bash git checkout rawhide git pull --ff-only - git checkout f36 + git checkout f37 git merge --ff-only rawhide - git push origin f36 + git push origin f37 ``` - [ ] 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 fffb8b61..3f51e783 100755 --- a/signing-ticket.sh +++ b/signing-ticket.sh @@ -15,11 +15,11 @@ make_script() { #!/bin/bash set -eux -o pipefail -# Use the Fedora 36 key for the detached signatures -KEYTOSIGNWITH='fedora-36' +# Use the Fedora 37 key for the detached signatures +KEYTOSIGNWITH='fedora-37' -VR='@@VERSION@@-@@RELEASE@@.fc36' -RPMKEY='38ab71f4' # Fedora 36 key +VR='@@VERSION@@-@@RELEASE@@.fc37' +RPMKEY='5323552a' # Fedora 37 key do_sign() { # Sign with sigul unless FAKESIGN=1