56 lines
2.1 KiB
Diff
56 lines
2.1 KiB
Diff
|
From 319c5612f69314b71c15862a0e0da249e61eeb89 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jan Macku <jamacku@redhat.com>
|
||
|
|
Date: Wed, 17 Jul 2024 10:11:29 +0200
|
||
|
|
Subject: [PATCH] ci: add support for rhel-only parameters
|
||
|
|
|
||
|
|
rhel-only: ci
|
||
|
|
|
||
|
|
Related: RHEL-30372
|
||
|
|
---
|
||
|
|
.github/advanced-commit-linter.yml | 4 ++--
|
||
|
|
CONTRIBUTING.md | 12 ++++++++++--
|
||
|
|
2 files changed, 12 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/.github/advanced-commit-linter.yml b/.github/advanced-commit-linter.yml
|
||
|
|
index 86f0e911f2..5693ae298d 100644
|
||
|
|
--- a/.github/advanced-commit-linter.yml
|
||
|
|
+++ b/.github/advanced-commit-linter.yml
|
||
|
|
@@ -4,8 +4,8 @@ policy:
|
||
|
|
- github: systemd/systemd
|
||
|
|
exception:
|
||
|
|
note:
|
||
|
|
- - rhel-only
|
||
|
|
- - RHEL-only
|
||
|
|
+ - 'rhel-only: (feature|bugfix|policy|doc|workaround|ci|test|other)'
|
||
|
|
+ - 'RHEL-only: (feature|bugfix|policy|doc|workaround|ci|test|other)'
|
||
|
|
tracker:
|
||
|
|
- keyword:
|
||
|
|
- 'Resolves: #?'
|
||
|
|
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
|
||
|
|
index bd17067be2..ce2d10d0c9 100644
|
||
|
|
--- a/CONTRIBUTING.md
|
||
|
|
+++ b/CONTRIBUTING.md
|
||
|
|
@@ -33,12 +33,20 @@ Every Pull Request has to comply with the following rules:
|
||
|
|
### Upstream reference
|
||
|
|
|
||
|
|
When doing a back-port of an upstream commit, always use `cherry-pick -x <sha>`. Consider proposing a change upstream first when an upstream commit doesn't exist.
|
||
|
|
-If the change isn't upstream relevant or accepted by upstream, mark the commit with the `rhel-only` string.
|
||
|
|
+If the change isn't upstream relevant or accepted by upstream, mark the commit with the `rhel-only: <parameter>` string, where a `<parameter>` is:
|
||
|
|
+
|
||
|
|
+- `feature` - for feature-related commits (cross-version)
|
||
|
|
+- `bugfix` - for bugfix-related commits (cross-version)
|
||
|
|
+- `doc` - for documentation-related commits (usually version-specific)
|
||
|
|
+- `workaround` - for workaround-related commits (usually version-specific)
|
||
|
|
+- `ci` - for CI-related commits (version-specific)
|
||
|
|
+- `test` - for test-related commits (version-specific)
|
||
|
|
+- `other` - for commits that do not fit into any of the above categories (version-specific)
|
||
|
|
|
||
|
|
```md
|
||
|
|
doc: Fix TYPO
|
||
|
|
|
||
|
|
-rhel-only
|
||
|
|
+rhel-only: doc
|
||
|
|
|
||
|
|
Resolves: RHEL-678
|
||
|
|
```
|