Merge pull request 'feat: validate g10k configuration' (#5) from benvin/g10k-test into master

Reviewed-on: #5

.gitea/workflows/build.yaml

@@ -1,24 +0,0 @@
-name: Build
-
-on:
-  pull_request:
-
-jobs:
-  build:
-    runs-on: almalinux-8
-    container:
-      image: git.query.consul/unkin/almalinux8:latest
-      options: --privileged
-
-    steps:
-      - name: Set up environment
-        run: |
-          dnf module enable -y nodejs:20
-          dnf install -y make bash git nodejs python3.11
-
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Run pre-commit
-        run: |
-          make build

.pre-commit-config.yaml

@@ -1,13 +1,29 @@
 repos:
-  - repo: 'https://github.com/adrienverge/yamllint'
-    rev: v1.32.0
+  # General file checks
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.5.0
     hooks:
-      - id: 'yamllint'
+      - id: check-added-large-files
+        args: ['--maxkb=500']
+      - id: check-merge-conflict
+      - id: check-symlinks
+      - id: check-yaml
+        args: [--allow-multiple-documents]
+      - id: end-of-file-fixer
+      - id: forbid-new-submodules
+      - id: trailing-whitespace
+
+  # YAML linting
+  - repo: https://github.com/adrienverge/yamllint.git
+    rev: v1.37.1
+    hooks:
+      - id: yamllint
         args:
           [
             "-d {extends: relaxed, rules: {line-length: disable}, ignore: chart}",
             "-s",
           ]
+
   - repo: https://github.com/jorisroovers/gitlint
     rev: v0.19.1
     hooks:

.woodpecker/g10k-validate.yaml

@@ -0,0 +1,13 @@
+when:
+  - event: pull_request
+
+steps:
+  - name: g10k-validate
+    image: git.unkin.net/unkin/almalinux9-g10k:20260308
+    commands:
+      - g10k -config r10k.yaml -validate
+
+  - name: g10k-run
+    image: git.unkin.net/unkin/almalinux9-g10k:20260308
+    commands:
+      - g10k -config r10k.yaml -verbose

.woodpecker/pre-commit.yaml

@@ -0,0 +1,8 @@
+when:
+  - event: pull_request
+
+steps:
+  - name: pre-commit
+    image: git.unkin.net/unkin/almalinux9-base:20260308
+    commands:
+      - uvx pre-commit run --all-files

Makefile

@@ -1,9 +1,3 @@
 # run pre-commit
-build:
-	python3.11 -m venv venv
-	venv/bin/pip install pip --upgrade
-	venv/bin/pip install pre-commit
-	venv/bin/pre-commit run --all-files
-
-clean:
-	rm -rf venv
+test:
+	uvx pre-commit run --all-files

r10k.yaml

@@ -1,10 +1,10 @@
 # The location to use for storing cached Git repos
-:cachedir: '/opt/puppetlabs/cache/r10k'
+:cachedir: '/etc/puppetlabs/code/.g10k/cachedir'
 
 # A list of git repositories to create
 :sources:
   # This will clone the git repository and instantiate an environment per
   # branch in /etc/puppetlabs/code/environments
   :unkin:
-    remote: 'https://git.service.au-syd1.consul/unkinben/puppet-prod.git'
+    remote: 'https://git.unkin.net/unkin/puppet-prod.git'
     basedir: '/etc/puppetlabs/code/environments'