Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync repo templates ⚙ #527

Merged
merged 1 commit into from
Apr 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 [email protected]`
- [ ] 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. 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` 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 39 key for the detached signatures
KEYTOSIGNWITH='fedora-39'
# Use the Fedora 40 key for the detached signatures
KEYTOSIGNWITH='fedora-40'

VR='@@VERSION@@-@@RELEASE@@.fc39'
RPMKEY='18b8e74c' # Fedora 39 key
VR='@@VERSION@@-@@RELEASE@@.fc40'
RPMKEY='a15b79cc' # Fedora 40 key

do_sign() {
# Sign with sigul unless FAKESIGN=1
Expand Down
Loading