Merge pull request #24593 from jamacku/main

Update `advanced-issue-labeler` action - `@v1` -> `@v2`

4 files changed, 149 insertions, 52 deletions

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 5ea99d79d0..d25f5ea68b 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -72,6 +72,8 @@ body:
       label: Component
       description: Please chose components related to this issue.
       multiple: true
+      # When updating list of components please also update labeling policy
+      # policy: `.github/advanced-issue-labeler.yml`
       options:
         - 'bootctl'
         - 'coredumpctl'
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 7f327e280e..1f24851b10 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -13,6 +13,8 @@ body:
       label: Component
       description: Please chose components related to this feature request.
       multiple: true
+      # When updating list of components please also update labeling policy
+      # policy: `.github/advanced-issue-labeler.yml`
       options:
         - 'bootctl'
         - 'coredumpctl'
diff --git a/.github/advanced-issue-labeler.yml b/.github/advanced-issue-labeler.yml
index 85146cab18..38388fb19d 100644
--- a/.github/advanced-issue-labeler.yml
+++ b/.github/advanced-issue-labeler.yml
@@ -1,51 +1,146 @@
-# syntax - https://github.com/redhat-plumbers-in-action/advanced-issue-labeler#policy
-# <name of label>: [<list of keywords>]
 ---
+# syntax - https://github.com/redhat-plumbers-in-action/advanced-issue-labeler#policy
 
 policy:
-  analyze: ['systemd-analyze']
-  ask-password: ['systemd-ask-password']
-  binfmt: ['systemd-binfmt']
-  cgtop: ['systemd-cgtop']
-  coredump: ['coredumpctl', 'systemd-coredump']
-  cryptsetup: ['systemd-cryptsetup']
-  delta: ['systemd-delta']
-  env: ['systemd-env-generator']
-  fsck: ['systemd-fsck']
-  gpt-auto: ['systemd-gpt-auto-generator']
-  growfs: ['systemd-growfs']
-  homed: ['systemd-homed', 'homectl', 'pam_systemd_home']
-  hostname: ['systemd-hostnamed', 'hostnamectl']
-  hwdb: ['systemd-hwdb', 'hardware database files']
-  import: ['systemd-import']
-  journal: ['systemd-journald', 'journalctl']
-  journal-remote: ['systemd-journal-remote', 'systemd-journal-upload', 'systemd-journal-gatewayd']
-  kernel-install: ['kernel-install']
-  logind: ['systemd-logind', 'loginctl', 'pam_systemd']
-  machined: ['systemd-machined', 'machinectl']
-  modules-load: ['systemd-modules-load']
-  network: ['systemd-networkd', 'networkctl', 'systemd-networkd-wait-online', 'systemd-network-generator']
-  nspawn: ['systemd-nspawn']
-  oomd: ['systemd-oomd', 'oomctl']
-  pid1: ['systemd']
-  portabled: ['systemd-portabled', 'portablectl']
-  pstore: ['systemd-pstore']
-  repart: ['systemd-repart']
-  resolve: ['systemd-resolved', 'resolvectl', 'nss-resolve']
-  rfkill: ['systemd-rfkill']
-  rpm: ['rpm scriptlets']
-  run: ['systemd-run']
-  sd-boot/sd-stub/bootctl: ['bootctl', 'systemd-boot', 'systemd-stub']
-  sysctl: ['systemd-sysctl']
-  sysext: ['systemd-sysext']
-  systemctl: ['systemctl']
-  sysusers: ['systemd-sysusers']
-  sysv: ['systemd-sysv-generator']
-  tests: ['tests']
-  timedate: ['systemd-timedate', 'timedatectl']
-  timesync: ['systemd-timesync']
-  tmpfiles: ['systemd-tmpfiles']
-  udev: ['systemd-udevd', 'udevadm', 'udev rule files']
-  userdb: ['systemd-userdb', 'userdbctl']
-  veritysetup: ['systemd-veritysetup']
-  xdg-autostart: ['systemd-xdg-autostart-generator']
+  - template: [bug_report.yml, feature_request.yml]
+    section:
+      - id: [component]
+        block-list: [other]
+        label:
+          - name: analyze
+            keys: ['systemd-analyze']
+
+          - name: ask-password
+            keys: ['systemd-ask-password']
+
+          - name: binfmt
+            keys: ['systemd-binfmt']
+
+          - name: cgtop
+            keys: ['systemd-cgtop']
+
+          - name: coredump
+            keys: ['coredumpctl', 'systemd-coredump']
+
+          - name: cryptsetup
+            keys: ['systemd-cryptsetup']
+
+          - name: delta
+            keys: ['systemd-delta']
+
+          - name: env
+            keys: ['systemd-env-generator']
+
+          - name: fsck
+            keys: ['systemd-fsck']
+
+          - name: gpt-auto
+            keys: ['systemd-gpt-auto-generator']
+
+          - name: growfs
+            keys: ['systemd-growfs']
+
+          - name: homed
+            keys: ['systemd-homed', 'homectl', 'pam_systemd_home']
+
+          - name: hostname
+            keys: ['systemd-hostnamed', 'hostnamectl']
+
+          - name: hwdb
+            keys: ['systemd-hwdb', 'hardware database files']
+
+          - name: import
+            keys: ['systemd-import']
+
+          - name: journal
+            keys: ['systemd-journald', 'journalctl']
+
+          - name: journal-remote
+            keys: ['systemd-journal-remote', 'systemd-journal-upload', 'systemd-journal-gatewayd']
+
+          - name: kernel-install
+            keys: ['kernel-install']
+
+          - name: logind
+            keys: ['systemd-logind', 'loginctl', 'pam_systemd']
+
+          - name: machined
+            keys: ['systemd-machined', 'machinectl']
+
+          - name: modules-load
+            keys: ['systemd-modules-load']
+
+          - name: network
+            keys: ['systemd-networkd', 'networkctl', 'systemd-networkd-wait-online', 'systemd-network-generator']
+
+          - name: nspawn
+            keys: ['systemd-nspawn']
+
+          - name: oomd
+            keys: ['systemd-oomd', 'oomctl']
+
+          - name: pid1
+            keys: ['systemd']
+
+          - name: portabled
+            keys: ['systemd-portabled', 'portablectl']
+
+          - name: pstore
+            keys: ['systemd-pstore']
+
+          - name: repart
+            keys: ['systemd-repart']
+
+          - name: resolve
+            keys: ['systemd-resolved', 'resolvectl', 'nss-resolve']
+
+          - name: rfkill
+            keys: ['systemd-rfkill']
+
+          - name: rpm
+            keys: ['rpm scriptlets']
+
+          - name: run
+            keys: ['systemd-run']
+
+          - name: sd-boot/sd-stub/bootctl
+            keys: ['bootctl', 'systemd-boot', 'systemd-stub']
+
+          - name: sysctl
+            keys: ['systemd-sysctl']
+
+          - name: sysext
+            keys: ['systemd-sysext']
+
+          - name: systemctl
+            keys: ['systemctl']
+
+          - name: sysusers
+            keys: ['systemd-sysusers']
+
+          - name: sysv
+            keys: ['systemd-sysv-generator']
+
+          - name: tests
+            keys: ['tests']
+
+          - name: timedate
+            keys: ['systemd-timedate', 'timedatectl']
+
+          - name: timesync
+            keys: ['systemd-timesync']
+
+          - name: tmpfiles
+            keys: ['systemd-tmpfiles']
+
+          - name: udev
+            keys: ['systemd-udevd', 'udevadm', 'udev rule files']
+
+          - name: userdb
+            keys: ['systemd-userdb', 'userdbctl']
+
+          - name: veritysetup
+            keys: ['systemd-veritysetup']
+
+          - name: xdg-autostart
+            keys: ['systemd-xdg-autostart-generator']
diff --git a/.github/workflows/issue_labeler.yml b/.github/workflows/issue_labeler.yml
index 2337b0fc64..6e45e40504 100644
--- a/.github/workflows/issue_labeler.yml
+++ b/.github/workflows/issue_labeler.yml
@@ -29,10 +29,8 @@ jobs:
           template-path: .github/ISSUE_TEMPLATE/${{ matrix.template }}
 
       - name: Set labels based on component field
-        uses: redhat-plumbers-in-action/advanced-issue-labeler@d12b782ff92bc9ac535fb09c925aaa5be9e40f69
+        uses: redhat-plumbers-in-action/advanced-issue-labeler@fe9c43b7d77bd8bd7fbe86c2c217e74ebeea71f2
         with:
           issue-form: ${{ steps.issue-parser.outputs.jsonString }}
-          section: component
-          block-list: |
-            other
+          template: ${{ matrix.template }}
           token: ${{ secrets.GITHUB_TOKEN }}