From 8176a628859f20966c2af78f553db533cff6e52d Mon Sep 17 00:00:00 2001
From: kireto <kireto@oblachno.com>
Date: Thu, 6 Aug 2026 09:23:29 +0000
Subject: [PATCH] GRM-159: fix: move StartLimit to [Unit] and make prune timer
 reload conditional

Co-authored-by: kireto <kireto@oblachno.com>
---
 .vale/styles/Google/OxfordComma.yml           | 29 ++++++++++++++-----
 ansible/roles/gitea_runner/tasks/prune.yml    |  3 ++
 ansible/roles/gitea_runner/tasks/service.yml  | 15 ++++++++++
 .../templates/gitea-runner-user.service.j2    |  4 +--
 pyproject.toml                                |  1 +
 5 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/.vale/styles/Google/OxfordComma.yml b/.vale/styles/Google/OxfordComma.yml
index a3ef78b..c4feb00 100644
--- a/.vale/styles/Google/OxfordComma.yml
+++ b/.vale/styles/Google/OxfordComma.yml
@@ -4,12 +4,25 @@ link: 'https://developers.google.com/style/commas'
 scope: sentence
 level: warning
 nonword: true
-# List items may be several words long, not just one. Two guards keep the
-# false-positive rate down: the item can't open with a clause-introducer
-# (', which ...', ', specifically ...'), and neither item may contain an
-# auxiliary verb, which is what separates a list from a compound predicate
-# (', it has some downsides and is officially discouraged.'). The trailing
-# anchor allows end-of-scope so list fragments ('Apples, pears or bananas')
-# are still caught.
+# List items may be several words long, not just one. Four guards keep the
+# false-positive rate down:
+#
+#   1. The comma can't be the one closing a fronted subordinate clause
+#      ('When your alarm rings, you turn it off and tumble out of bed.') --
+#      that comma separates clauses, not list items. Only the first comma of
+#      such a sentence is exempt, so 'When it rains, apples, pears or bananas
+#      get wet.' is still caught.
+#   2. The item can't open with a clause-introducer (', which ...',
+#      ', specifically ...').
+#   3. The item can't open with a subject pronoun followed by a verb, which
+#      marks a compound predicate rather than a list ('..., you walk to the
+#      fridge and get a snack.'). A pronoun directly followed by 'and'/'or'
+#      is a real list item, so ', you and me.' still matches.
+#   4. Neither item may contain an auxiliary verb, which is another compound
+#      predicate signal (', it has some downsides and is officially
+#      discouraged.').
+#
+# The trailing anchor allows end-of-scope so list fragments ('Apples, pears
+# or bananas') are still caught.
 tokens:
-  - ',\s(?!(?:which|who|whom|whose|that|where|when|while|because|since|although|though|if|unless|so|but|and|or|however|therefore|thus|specifically|especially|namely|then|take|see|note|consider|make|use|either|neither)\b)(?:(?!\b(?:is|are|was|were|has|have|had|be|been|being|will|would|can|could|should|may|might|must|do|does|did)\b)\w+ ){0,4}\w+ (?:and|or) (?:(?!\b(?:is|are|was|were|has|have|had|be|been|being|will|would|can|could|should|may|might|must|do|does|did)\b)\w+ ){0,4}\w+(?:[.?!]|$)'
+  - '(?<!^(?i:when|whenever|while|if|unless|until|although|though|because|since|after|before|once|whereas|whether|as)\b[^,]{0,80}),\s(?!(?:which|who|whom|whose|that|where|when|while|because|since|although|though|if|unless|so|but|and|or|however|therefore|thus|specifically|especially|namely|then|take|see|note|consider|make|use|either|neither)\b)(?!(?i:i|you|we|they|he|she|it)\s+(?!(?:and|or)\b))(?:(?!\b(?:is|are|was|were|has|have|had|be|been|being|will|would|can|could|should|may|might|must|do|does|did)\b)\w+ ){0,4}\w+ (?:and|or) (?:(?!\b(?:is|are|was|were|has|have|had|be|been|being|will|would|can|could|should|may|might|must|do|does|did)\b)\w+ ){0,4}\w+(?:[.?!]|$)'
diff --git a/ansible/roles/gitea_runner/tasks/prune.yml b/ansible/roles/gitea_runner/tasks/prune.yml
index e668a67..245b17c 100644
--- a/ansible/roles/gitea_runner/tasks/prune.yml
+++ b/ansible/roles/gitea_runner/tasks/prune.yml
@@ -6,6 +6,7 @@
     owner: "{{ gitea_runner_service_user }}"
     group: "{{ gitea_runner_service_user }}"
     mode: "0644"
+  register: gitea_runner_prune_service
 
 - name: Create docker-prune user timer file
   ansible.builtin.template:
@@ -14,6 +15,7 @@
     owner: "{{ gitea_runner_service_user }}"
     group: "{{ gitea_runner_service_user }}"
     mode: "0644"
+  register: gitea_runner_prune_timer
 
 - name: Reload systemd user daemon for prune timer
   ansible.builtin.command: systemctl --user daemon-reload
@@ -26,6 +28,7 @@
   when:
     - gitea_runner_systemd_available.stat.exists
     - gitea_runner_docker_rootless_setup
+    - gitea_runner_prune_service is changed or gitea_runner_prune_timer is changed
 
 - name: Enable and start docker-prune user timer
   ansible.builtin.command: systemctl --user enable --now docker-prune.timer
diff --git a/ansible/roles/gitea_runner/tasks/service.yml b/ansible/roles/gitea_runner/tasks/service.yml
index 62a02b9..bc18c8a 100644
--- a/ansible/roles/gitea_runner/tasks/service.yml
+++ b/ansible/roles/gitea_runner/tasks/service.yml
@@ -6,6 +6,7 @@
     owner: "{{ gitea_runner_service_user }}"
     group: "{{ gitea_runner_service_user }}"
     mode: "0644"
+  register: gitea_runner_service_file
 
 - name: Reload systemd user daemon
   ansible.builtin.command: systemctl --user daemon-reload
@@ -18,6 +19,20 @@
   when:
     - gitea_runner_systemd_available.stat.exists
     - gitea_runner_docker_rootless_setup
+    - gitea_runner_service_file is changed
+
+- name: Restart gitea-runner if service file changed
+  ansible.builtin.command: systemctl --user restart gitea-runner
+  become: true
+  become_user: "{{ gitea_runner_service_user }}"
+  environment:
+    XDG_RUNTIME_DIR: "/run/user/{{ gitea_runner_uid }}"
+    DBUS_SESSION_BUS_ADDRESS: "unix:path=/run/user/{{ gitea_runner_uid | default(0) }}/bus"
+  changed_when: true
+  when:
+    - gitea_runner_systemd_available.stat.exists
+    - gitea_runner_docker_rootless_setup
+    - gitea_runner_service_file is changed
 
 - name: Enable and start gitea-runner user service
   ansible.builtin.command: systemctl --user enable --now gitea-runner
diff --git a/ansible/roles/gitea_runner/templates/gitea-runner-user.service.j2 b/ansible/roles/gitea_runner/templates/gitea-runner-user.service.j2
index b130809..45373ba 100644
--- a/ansible/roles/gitea_runner/templates/gitea-runner-user.service.j2
+++ b/ansible/roles/gitea_runner/templates/gitea-runner-user.service.j2
@@ -3,6 +3,8 @@ Description=Gitea Actions Runner (rootless)
 After=docker.service
 Requires=docker.service
 PartOf=docker.service
+StartLimitIntervalSec=300
+StartLimitBurst=10
 
 [Service]
 Type=simple
@@ -14,8 +16,6 @@ ExecStop=/bin/kill -TERM $MAINPID
 TimeoutStopSec=30
 Restart=always
 RestartSec={{ gitea_runner_service_restart_sec }}
-StartLimitIntervalSec=300
-StartLimitBurst=10
 
 [Install]
 WantedBy=default.target
diff --git a/pyproject.toml b/pyproject.toml
index 5fc0e62..f3184bd 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -32,6 +32,7 @@ version = {attr = "grm.__version__"}
 ci = [
     "pytest==9.1.1",
     "pytest-cov==7.1.0",
+    "pytest-xdist==3.8.0",
     "build==1.5.1",
     "twine==6.2.0",
     # Reusable CI/CD and dev tools (auto-merge, pr-review, pre-push checks, etc.)