From da6b82e9798669d27df4fbed47c1da0a518faf9c Mon Sep 17 00:00:00 2001 From: CoreOS Bot Date: Mon, 16 Dec 2024 13:59:12 +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@f30bff694a01ea95a89fa8f825b8a8d8047a8a3e. --- .github/ISSUE_TEMPLATE/release-checklist.md | 6 +++--- docs/_config.yml | 2 +- signing-ticket.sh | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/release-checklist.md b/.github/ISSUE_TEMPLATE/release-checklist.md index 49502295b..a6df15743 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 ignition.spec | sed 's:.*/::')` - [ ] PR the changes in [Fedora](https://src.fedoraproject.org/rpms/ignition) - - [ ] Once the PR merges to rawhide, merge rawhide into the other relevant branches (e.g. f40) then push those, for example: + - [ ] Once the PR merges to rawhide, merge rawhide into the other relevant branches (e.g. f41) then push those, for example: ```bash git checkout rawhide git pull --ff-only - git checkout f40 + git checkout f41 git merge --ff-only rawhide - git push origin f40 + git push origin f41 ``` - [ ] 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/docs/_config.yml b/docs/_config.yml index 2e918bd0f..ac3999130 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -14,7 +14,7 @@ kramdown: ndash: "--" mdash: "---" -remote_theme: just-the-docs/just-the-docs@v0.8.1 +remote_theme: just-the-docs/just-the-docs@v0.10.0 plugins: - jekyll-remote-theme diff --git a/signing-ticket.sh b/signing-ticket.sh index 1f4c3ba56..ff8595c11 100755 --- a/signing-ticket.sh +++ b/signing-ticket.sh @@ -15,11 +15,11 @@ make_script() { #!/bin/bash set -eux -o pipefail -# Use the Fedora 40 key for the detached signatures -KEYTOSIGNWITH='fedora-40' +# Use the Fedora 41 key for the detached signatures +KEYTOSIGNWITH='fedora-41' -VR='@@VERSION@@-@@RELEASE@@.fc40' -RPMKEY='a15b79cc' # Fedora 40 key +VR='@@VERSION@@-@@RELEASE@@.fc41' +RPMKEY='e99d6ad1' # Fedora 41 key do_sign() { # Sign with sigul unless FAKESIGN=1