From 6f049f9a9c2bbde403d09cda5812530c5f54acdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <kevin@dunglas.fr>
Date: Sat, 31 May 2025 08:01:38 +0200
Subject: [PATCH] ci: minor cleanup (#1619)

* ci: minor cleanup

* add .golangci.yaml
---
 .github/dependabot.yaml      | 5 -----
 .github/workflows/lint.yaml  | 2 --
 .github/workflows/tests.yaml | 5 ++---
 .golangci.yaml               | 7 +++++++
 4 files changed, 9 insertions(+), 10 deletions(-)
 create mode 100644 .golangci.yaml

diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
index 9f07ece8..c597c81a 100644
--- a/.github/dependabot.yaml
+++ b/.github/dependabot.yaml
@@ -17,11 +17,6 @@ updates:
       interval: weekly
     commit-message:
       prefix: chore(caddy)
-    # These packages must be in sync with versions
-    # used by github.com/caddyserver/caddy/v2
-    ignore:
-      - dependency-name: github.com/google/cel-go
-      - dependency-name: github.com/quic-go/*
     groups:
       go-modules:
         patterns:
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 54c7ae70..eeafdc6e 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -23,8 +23,6 @@ jobs:
       - name: Lint Code Base
         uses: super-linter/super-linter/slim@v7.4.0
         env:
-          VALIDATE_ALL_CODEBASE: true
-          DEFAULT_BRANCH: main
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           LINTER_RULES_PATH: /
           MARKDOWN_CONFIG_FILE: .markdown-lint.yaml
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index c45d26ef..85e5469a 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -15,6 +15,7 @@ permissions:
   contents: read
 env:
   GOTOOLCHAIN: local
+  GOEXPERIMENT: cgocheck2
 jobs:
   tests-linux:
     name: Tests (Linux, PHP ${{ matrix.php-versions }})
@@ -24,7 +25,6 @@ jobs:
       matrix:
         php-versions: ["8.2", "8.3", "8.4"]
     env:
-      GOEXPERIMENT: cgocheck2
       GOMAXPROCS: 10
       LIBRARY_PATH: ${{ github.workspace }}/watcher/target/lib
     steps:
@@ -46,7 +46,7 @@ jobs:
           debug: true
       - name: Install e-dant/watcher
         uses: ./.github/actions/watcher
-      - name: Set Set CGO flags
+      - name: Set CGO flags
         run: echo "CGO_CFLAGS=-I${PWD}/watcher/target/include $(php-config --includes)" >> "${GITHUB_ENV}"
       - name: Build
         run: go build
@@ -78,7 +78,6 @@ jobs:
     name: Tests (macOS, PHP 8.4)
     runs-on: macos-latest
     env:
-      GOEXPERIMENT: cgocheck2
       HOMEBREW_NO_AUTO_UPDATE: 1
     steps:
       - uses: actions/checkout@v4
diff --git a/.golangci.yaml b/.golangci.yaml
new file mode 100644
index 00000000..d4a2fe2c
--- /dev/null
+++ b/.golangci.yaml
@@ -0,0 +1,7 @@
+---
+version: "2"
+run:
+  build-tags:
+    - nobadger
+    - nomysql
+    - nopgx