From 9d06023a96da8e34b0ce20b1d1e87750508b167a Mon Sep 17 00:00:00 2001 From: CoreOS Bot Date: Wed, 24 Apr 2024 22:16:34 +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@f147a34ea797eff8193a3e3686b64d59594fffa2. --- .github/ISSUE_TEMPLATE/release-checklist.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/release-checklist.md b/.github/ISSUE_TEMPLATE/release-checklist.md index a60a64b..ff8f46b 100644 --- a/.github/ISSUE_TEMPLATE/release-checklist.md +++ b/.github/ISSUE_TEMPLATE/release-checklist.md @@ -103,13 +103,13 @@ Push access to the upstream repository is required in order to publish the new t - [ ] run `kinit your_fas_account@FEDORAPROJECT.ORG` - [ ] run `fedpkg new-sources $(spectool -S rust-ssh-key-dir.spec | sed 's:.*/::')` - [ ] PR the changes in [Fedora](https://src.fedoraproject.org/rpms/rust-ssh-key-dir) - - [ ] once the PR merges to rawhide, merge rawhide into the other relevant branches (e.g. f39) then push those, for example: + - [ ] once the PR merges to rawhide, merge rawhide into the other relevant branches (e.g. f40) then push those, for example: ```bash git checkout rawhide git pull --ff-only - git checkout f39 + git checkout f40 git merge --ff-only rawhide - git push origin f39 + git push origin f40 ``` - [ ] on each of those branches run `fedpkg build` - [ ] once the builds have finished, submit them to [bodhi](https://bodhi.fedoraproject.org/updates/new), filling in: