From a665b4385492227ff68b1b13971eb94a202180c4 Mon Sep 17 00:00:00 2001
From: Max Gautier <mg@max.gautier.name>
Date: Mon, 3 Mar 2025 10:30:58 +0100
Subject: [PATCH] CI: Put pre-commit cache under CI_PROJECT_DIR (#11929)

* CI: Put pre-commit cache under CI_PROJECT_DIR

Apparently gitlab-runner can't cache stuff outside of the project
directory.

Put the cache under CI_PROJECT_DIR to make it work (which also means we
need to ignore it from ansible-lint).

Also update the pre-commit image while we're at it.

Link: https://gitlab.com/gitlab-org/gitlab/-/issues/14151

* update ansible-lint pre-commit
---
 .ansible-lint           | 1 +
 .gitlab-ci/lint.yml     | 9 +++++----
 .pre-commit-config.yaml | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.ansible-lint b/.ansible-lint
index b8955f4a4..5f3fa2d81 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -38,5 +38,6 @@ exclude_paths:
   - venv
   - .github
   - .ansible
+  - .cache
 mock_modules:
   - gluster.gluster.gluster_volume
diff --git a/.gitlab-ci/lint.yml b/.gitlab-ci/lint.yml
index 3dc0e46c0..1fc50fe9a 100644
--- a/.gitlab-ci/lint.yml
+++ b/.gitlab-ci/lint.yml
@@ -3,15 +3,16 @@ pre-commit:
   stage: test
   tags:
   - ffci
-  image: 'ghcr.io/pre-commit-ci/runner-image@sha256:aaf2c7b38b22286f2d381c11673bec571c28f61dd086d11b43a1c9444a813cef'
+  image: 'ghcr.io/pre-commit-ci/runner-image@sha256:fe01a6ec51b298412990b88627c3973b1146c7304f930f469bafa29ba60bcde9'
   variables:
-    PRE_COMMIT_HOME: /pre-commit-cache
+    PRE_COMMIT_HOME: ${CI_PROJECT_DIR}/.cache/pre-commit
   script:
   - pre-commit run --all-files --show-diff-on-failure
   cache:
-    key: pre-commit-all
+    key: pre-commit-2
     paths:
-    - /pre-commit-cache
+    - ${PRE_COMMIT_HOME}
+    when: 'always'
   needs: []
 
 vagrant-validate:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index c8d38246f..4f298e502 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -29,7 +29,7 @@ repos:
         files: "\\.sh$"
 
   - repo: https://github.com/ansible/ansible-lint
-    rev: v25.1.0
+    rev: v25.1.1
     hooks:
       - id: ansible-lint
         additional_dependencies: