.gitea/workflows/ci.yml

@@ -5,10 +5,13 @@ on:
   push:
     branches: [master]
   pull_request:
+    types: [opened, synchronize, reopened]
 
 jobs:
   lint-and-test:
     runs-on: ubuntu-latest
+    # Skip push events for non-master branches (they'll be covered by PR events)
+    if: github.event_name == 'pull_request' || github.ref == 'refs/heads/master'
     container:
       image: node:20-bullseye
     steps:
@@ -27,6 +30,8 @@ jobs:
 
   ansible-validation:
     runs-on: ubuntu-latest
+    # Skip push events for non-master branches (they'll be covered by PR events)
+    if: github.event_name == 'pull_request' || github.ref == 'refs/heads/master'
     container:
       image: ubuntu:22.04
     steps:

docs/guides/timeshift.md

@@ -2,7 +2,8 @@
 
 ## Overview
 
-Timeshift is a system restore utility that creates snapshots of your system before Ansible playbook execution. This allows you to easily rollback if something goes wrong during configuration changes.
+Timeshift is a system restore utility that creates snapshots of your system before Ansible playbook execution.
+This allows you to easily rollback if something goes wrong during configuration changes.
 
 ## How It Works
 
@@ -190,7 +191,8 @@ timeshift_keep_weekly: 2  # Reduce from 4
 
 ## Integration with Ansible
 
-The Timeshift role is automatically included in the development playbook and runs first to create snapshots before any changes are made. This ensures you always have a restore point.
+The Timeshift role is automatically included in the development playbook and runs first to create snapshots before any changes are made.
+This ensures you always have a restore point.
 
 ```yaml
 # playbooks/development.yml

roles/development/tasks/main.yml

@@ -46,11 +46,7 @@
     fi
   register: nodesource_key_check
   failed_when: false
-<<<<<<< HEAD
-  changed_when: false
-=======
   changed_when: false  # noqa command-instead-of-module
->>>>>>> 5d3b339 (Fix: Resolve linting errors and improve firewall configuration)
   when: node_version_check.rc != 0 or not node_version_check.stdout.startswith('v22')
 
 - name: Remove incorrect NodeSource repository