diff --git a/.packit.yaml b/.packit.yaml index 62c2e53..19b5a5a 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -6,33 +6,61 @@ files_to_sync: - .packit.yaml upstream_package_name: greenboot upstream_tag_template: v{version} -copy_upstream_release_description: true downstream_package_name: greenboot +packages: + greenboot-fedora: + downstream_package_name: greenboot + upstream_package_name: greenboot + greenboot-centos: + downstream_package_name: greenboot + upstream_package_name: greenboot + pkg_tool: centpkg + jobs: - - job: copr_build + + # Fedora jobs + + - &greenboot_copr_build_fedora + job: copr_build + packages: [greenboot-fedora] trigger: pull_request - targets: - - fedora-development - - fedora-latest-stable + targets: ["fedora-latest-stable", "fedora-latest", "fedora-rawhide"] + + - <<: *greenboot_copr_build_fedora + trigger: commit + branch: main + owner: "@fedora-iot" + project: fedora-iot - job: sync_from_downstream trigger: commit - job: propose_downstream trigger: release - dist_git_branches: - - fedora-development - - fedora-latest-stable + packages: [greenboot-fedora] + dist_git_branches: ["fedora-development", "fedora-latest-stable"] - job: koji_build trigger: commit - dist_git_branches: - - fedora-development - - fedora-latest-stable + allowed_pr_authors: [all_committers] + dist_git_branches: ["fedora-development", "fedora-latest-stable"] - job: bodhi_update trigger: commit - dist_git_branches: - - fedora-development - - fedora-latest-stable + allowed_builders: [all_committers] + dist_git_branches: ["fedora-development", "fedora-latest-stable"] + + # CentOS jobs + + - &greenboot_copr_build_centos + job: copr_build + packages: [greenboot-centos] + trigger: pull_request + targets: ["centos-stream-9", "centos-stream-10"] + + - <<: *greenboot_copr_build_centos + trigger: commit + branch: main + owner: "@fedora-iot" + project: fedora-iot diff --git a/0001-add-RELEASING.md.patch b/0001-add-RELEASING.md.patch new file mode 100644 index 0000000..a5d5a77 --- /dev/null +++ b/0001-add-RELEASING.md.patch @@ -0,0 +1,59 @@ +From 8c9163b8b3c68835c46420fd373f51dbf27ad1a6 Mon Sep 17 00:00:00 2001 +From: Antonio Murdaca +Date: Thu, 20 Feb 2025 11:21:27 +0100 +Subject: [PATCH] add RELEASING.md + +Signed-off-by: Antonio Murdaca +--- + RELEASING.md | 39 +++++++++++++++++++++++++++++++++++++++ + 1 file changed, 39 insertions(+) + create mode 100644 RELEASING.md + +diff --git a/RELEASING.md b/RELEASING.md +new file mode 100644 +index 0000000..7320b34 +--- /dev/null ++++ b/RELEASING.md +@@ -0,0 +1,39 @@ ++Releasing a new version ++======================= ++ ++We will use the `v0.15.8` release [#202](https://github.com/fedora-iot/greenboot/pull/202) as an example of how to release a new ++greenboot version: ++ ++* Fork the repo and create a new branch for the new release: ++ ++ ```bash ++ gh repo fork fedora-iot/greenboot --clone --remote ++ git pull upstream main ++ git checkout -b prepare-v0.15.8 ++ ``` ++ ++* Update the `greenboot.spec` file and set the new version: `rpmdev-bumpspec -n 0.15.8 greenboot.spec` ++* Update anything required for the new RPM ++* Update the changelog section of the spec file ++* Commit all the changes and create a PR (see #738 with all the changes described ++above): ++ ++ ```bash ++ git add greenboot.spec # add anything else needed ++ git commit -s -m "chore: bump for 0.15.8 release" -m "Prepare for the 0.15.8 release." ++ gh pr create ++ ``` ++ ++* Once all the tests pass and the PR is merged, tag and sign the release: ++ ++ ```bash ++ git tag -a -s v0.15.8 ++ git push upstream v0.15.8 ++ ``` ++ ++* Using the webui, open the [Releases](https://github.com/fedora-iot/greenboot/releases) ++page and click the "Draft a new release" button in the middle of the page. From ++there you can choose the `v0.15.8` tag you created in the previous step. ++ * Use the version as the "Release title" and keep the format i.e. "v0.15.8". ++ * In the description add in any release notes or click "Generate release notes". ++ When satisfied, click the "Save draft" or "Publish release" button at the bottom of the page. +-- +2.48.1 + diff --git a/greenboot.spec b/greenboot.spec index 075dcba..56e6d2c 100644 --- a/greenboot.spec +++ b/greenboot.spec @@ -2,7 +2,7 @@ Name: greenboot Version: 0.15.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Generic Health Check Framework for systemd License: LGPL-2.1-or-later @@ -12,8 +12,15 @@ License: LGPL-2.1-or-later URL: https://github.com/%{repo_owner}/%{repo_name} Source0: https://github.com/%{repo_owner}/%{repo_name}/archive/%{repo_tag}.tar.gz +# add RELEASING.md +# Author: Antonio Murdaca +Patch0001: 0001-add-RELEASING.md.patch -ExcludeArch: s390x {%ix86} +%if 0%{?fedora} || 0%{?rhel} >= 10 +ExcludeArch: s390x %{ix86} +%else +ExcludeArch: s390x +%endif BuildRequires: systemd-rpm-macros %{?systemd_requires} Requires: systemd >= 240 @@ -176,6 +183,10 @@ fi %{_prefix}/lib/%{name}/check/required.d/02_watchdog.sh %changelog +* Fri Feb 28 2025 Antonio Murdaca - 0.15.8-2 +- Update to version 0.15.8 +- Resolves: RHEL-78244 + * Wed Feb 26 2025 Antonio Murdaca - 0.15.8-1 ## What's Changed * ci: add ci test for pull request by @yih-redhat in https://github.com/fedora-iot/greenboot/pull/164