Skip to content

Commit

Permalink
Merge pull request #409 from coreosbot-releng/repo-templates
Browse files Browse the repository at this point in the history
Sync repo templates ⚙
  • Loading branch information
prestist committed Dec 14, 2022
2 parents fae2183 + 186cbfe commit 6986148
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/release-checklist.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions signing-ticket.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6986148

Please sign in to comment.