Enhance CI workflow and update Timeshift documentation
Some checks failed
CI / lint-and-test (pull_request) Successful in 1m0s
CI / ansible-validation (pull_request) Successful in 2m11s
CI / secret-scanning (pull_request) Successful in 57s
CI / dependency-scan (pull_request) Successful in 1m2s
CI / sast-scan (pull_request) Successful in 1m55s
CI / license-check (pull_request) Successful in 58s
CI / vault-check (pull_request) Failing after 1m54s
CI / playbook-test (pull_request) Successful in 1m52s
CI / container-scan (pull_request) Successful in 1m26s
CI / sonar-analysis (pull_request) Successful in 2m5s
CI / workflow-summary (pull_request) Successful in 55s

- Update CI workflow to skip push events for non-master branches, ensuring only relevant events trigger jobs.
- Improve Timeshift documentation for clarity by splitting long sentences into shorter ones for better readability.
- Maintain consistent formatting in development role tasks by removing unnecessary conflict markers.
This commit is contained in:
ilia 2025-12-17 22:59:13 -05:00
parent 01d35172e4
commit adf5ffecf7
3 changed files with 9 additions and 6 deletions

View File

@ -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:

View File

@ -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

View File

@ -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