From 50f8b97e2a03bd5bb42c829283f70e33092e4b77 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Tue, 21 Apr 2026 22:46:37 -0500 Subject: [PATCH] Prepare migration to Fedora Forge --- .builds/42.yml | 26 ----------------- .builds/{41.yml => 43.yml} | 4 +-- .builds/9.yml | 2 +- .builds/main.yml | 16 +++-------- CONTRIBUTING.md | 57 ++++++++------------------------------ README.md | 6 ++-- ci.yml.in | 2 +- cigen.sh | 4 +-- 8 files changed, 24 insertions(+), 93 deletions(-) delete mode 100644 .builds/42.yml rename .builds/{41.yml => 43.yml} (87%) diff --git a/.builds/42.yml b/.builds/42.yml deleted file mode 100644 index 973b095..0000000 --- a/.builds/42.yml +++ /dev/null @@ -1,26 +0,0 @@ ---- -# Copyright (C) 2023 Maxwell G -# SPDX-License-Identifier: GPL-1.0-or-later - -# NOTICE: This file is generated from ci.yml.in. Do not edit! - -image: fedora/42 -packages: - - gawk - - python3-pytest - - python3-pyyaml - - redhat-rpm-config - - rpm -sources: - - https://git.sr.ht/~gotmax23/forge-srpm-macros -tasks: - - pytest: | - cd forge-srpm-macros - if [ "$(rpm -E %{?rhel})" = "9" ]; then - sudo dnf install -y epel-rpm-macros - make epel9-build - export \ - MACRO_DIR="$(pwd)/epel9/rpm/macros.d" \ - MACRO_LUA_DIR="$(pwd)/epel9/rpm/lua" - fi - pytest -vv diff --git a/.builds/41.yml b/.builds/43.yml similarity index 87% rename from .builds/41.yml rename to .builds/43.yml index 9c8bd2d..0c3eede 100644 --- a/.builds/41.yml +++ b/.builds/43.yml @@ -4,7 +4,7 @@ # NOTICE: This file is generated from ci.yml.in. Do not edit! -image: fedora/41 +image: fedora/43 packages: - gawk - python3-pytest @@ -12,7 +12,7 @@ packages: - redhat-rpm-config - rpm sources: - - https://git.sr.ht/~gotmax23/forge-srpm-macros + - https://forge.fedoraproject.org/packaging/forge-srpm-macros tasks: - pytest: | cd forge-srpm-macros diff --git a/.builds/9.yml b/.builds/9.yml index 15196c1..1f779c7 100644 --- a/.builds/9.yml +++ b/.builds/9.yml @@ -12,7 +12,7 @@ packages: - redhat-rpm-config - rpm sources: - - https://git.sr.ht/~gotmax23/forge-srpm-macros + - https://forge.fedoraproject.org/packaging/forge-srpm-macros tasks: - pytest: | cd forge-srpm-macros diff --git a/.builds/main.yml b/.builds/main.yml index a2d9a25..e942ae8 100644 --- a/.builds/main.yml +++ b/.builds/main.yml @@ -13,19 +13,11 @@ packages: - redhat-rpm-config - rpm sources: - - https://git.sr.ht/~gotmax23/forge-srpm-macros -secrets: - # gotmax23/forge-srpm-macros-dev webhook - - 454377f4-e19c-4e44-a21d-6462e3d06ea2 + - https://forge.fedoraproject.org/packaging/forge-srpm-macros tasks: - - setup: | - pipx install git+https://git.sr.ht/~gotmax23/releaserr - - copr-webhook: | - cd forge-srpm-macros - releaserr copr-webhook ~/.copr-dev-hook --branch origin/main --skip-if-missing - - pytest: | - cd forge-srpm-macros - pytest -vv - lint: | cd forge-srpm-macros nox -e lint + - pytest: | + cd forge-srpm-macros + pytest -vv diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5c5f6d2..5dacfcf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,6 +6,8 @@ SPDX-License-Identifier: GPL-1.0-or-later # Contributing +This project is hosted on Fedora Forge. + This project's mailing list is [~gotmax23/forge-srpm-macros@lists.sr.ht][mailto] ([archives]). @@ -23,51 +25,16 @@ todo.sr.ht, but it's only for confirmed issues. [tracker]: https://todo.sr.ht/~gotmax23/forge-srpm-macros +## Patches + +Contributing patches isalways welcome! +It is recommended that you send a message to the mailing list or create an +issue before working on a larger change. +Please run tests locally before submitting your changes. + ## Testing This repository uses `nox` to run unit tests and Python linters. - -## Patches - -Contributions are always welcome! -It is recommended that you send a message to the mailing list before working on -a larger change. - -Patches can be sent to [~gotmax23/forge-srpm-macros@lists.sr.ht][mailto] -using [`git send-email`][1]. -No Sourcehut account is required! - -After configuring git-send-email as explained at [git-send-email.io][1]: - -[mailto]: mailto:~gotmax23/forge-srpm-macros@lists.sr.ht -[archives]: https://lists.sr.ht/~gotmax23/forge-srpm-macros -[1]: https://git-send-email.io - -``` -# Clone the repo -git clone https://git.sr.ht/~gotmax23/forge-srpm-macros -cd forge-srpm-macros - -# Configure the repo. Only needs to be run once. -git config sendemail.to "~gotmax23/forge-srpm-macros@lists.sr.ht" -git config format.subjectprefix "PATCH forge-srpm-macros" - -# Make your changes -$EDITOR ... - -# Run tests using mock -nox - -# Commit your changes and send your patch to the mailing list -git commit -a -v -git send-email origin/main -``` - -See [git-send-email.io][1] for more details. - -If you prefer, git.sr.ht has a webui to help you submit patches to a mailing -list that can be used in place of `git send-email`. You can follow [this -written guide][2] or [this video guide][3] for how to use the webui. - -[2]: https://man.sr.ht/git.sr.ht/#sending-patches-upstream -[3]: https://spacepub.space/w/no6jnhHeUrt2E5ST168tRL +You can `dnf install nox` and then invoke `nox` to run everything. +CI is run through https://builds.sr.ht using the [yojo](https://codeberg.org/emersion/yojo/) bridge +on pushes to `main` and PRs. diff --git a/README.md b/README.md index 24fa3b3..ccf540c 100644 --- a/README.md +++ b/README.md @@ -16,9 +16,7 @@ This code has been split out from redhat-rpm-config to ease maintenance. ## Links -- [forge-srpm-macros project hub](https://sr.ht/~gotmax23/forge-srpm-macros) -- [forge-srpm-macros git.sr.ht repo](https://git.sr.ht/~gotmax23/forge-srpm-macros) -- [forge-srpm-macros tracker](https://todo.sr.ht/~gotmax23/forge-srpm-macros) +- [forge-srpm-macros Forge](https://forge.fedoraporject.org/packaging/forge-srpm-macros) - [forge-srpm-macros mailing list][archives] ([~gotmax/forge-srpm-macros@lists.sr.ht][mailto]) [archives]: https://lists.sr.ht/~gotmax23/forge-srpm-macros @@ -27,7 +25,7 @@ This code has been split out from redhat-rpm-config to ease maintenance. ## Compatibility The minimum supported RPM version is 4.16. The macros are tested in CI on -Fedora 38+ and EL 9. +Fedora 43+ and EL 9. ## Contributing diff --git a/ci.yml.in b/ci.yml.in index d9dbd0b..4d30b12 100644 --- a/ci.yml.in +++ b/ci.yml.in @@ -12,7 +12,7 @@ packages: - redhat-rpm-config - rpm sources: - - https://git.sr.ht/~gotmax23/forge-srpm-macros + - https://forge.fedoraproject.org/packaging/forge-srpm-macros tasks: - pytest: | cd forge-srpm-macros diff --git a/cigen.sh b/cigen.sh index 7c36a17..9021eda 100755 --- a/cigen.sh +++ b/cigen.sh @@ -4,7 +4,7 @@ set -euo pipefail -for i in rockylinux/9 fedora/41 fedora/42; do +for i in rockylinux/9 fedora/43; do file=".builds/$(echo $i | cut -d/ -f2).yml" - sed "s|@@IMAGE@@|$i|" ci.yml.in >$file + sed "s|@@IMAGE@@|$i|" ci.yml.in >"$file" done