From 9b029d53d75972302557668d294bcdaceef04ed5 Mon Sep 17 00:00:00 2001
From: Fernandez Ludovic <ldez@users.noreply.github.com>
Date: Fri, 20 May 2022 22:42:26 +0200
Subject: [PATCH] chore: update CI

---
 .github/workflows/documentation.yml | 26 ++------------------------
 .github/workflows/pr.yml            |  2 +-
 .golangci.toml                      |  7 ++++++-
 3 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 4ab21db3..f6e37f3e 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -29,30 +29,8 @@ jobs:
         with:
           fetch-depth: 0
 
-      # https://golangci-lint.run/usage/install#other-ci
-      - name: Install golangci-lint ${{ env.GOLANGCI_LINT_VERSION }}
-        run: |
-          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin ${GOLANGCI_LINT_VERSION}
-          golangci-lint --version
-
-      - name: Install Pebble and challtestsrv
-        run: GO111MODULE=off go get -u github.com/letsencrypt/pebble/...
-
-      - name: Set up a Memcached server
-        uses: niden/actions-memcached@v7
-
-      - name: Setup /etc/hosts
-        run: |
-          echo "127.0.0.1 acme.wtf" | sudo tee -a /etc/hosts
-          echo "127.0.0.1 lego.wtf" | sudo tee -a /etc/hosts
-          echo "127.0.0.1 acme.lego.wtf" | sudo tee -a /etc/hosts
-          echo "127.0.0.1 légô.wtf" | sudo tee -a /etc/hosts
-          echo "127.0.0.1 xn--lg-bja9b.wtf" | sudo tee -a /etc/hosts
-
-      - name: Make
-        run: |
-          make
-          make clean
+      - name: Generate DNS docs
+        run: make generate-dns
 
       - name: Install Hugo
         run: |
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index fca0f497..cef5689f 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       GO_VERSION: 1.18
-      GOLANGCI_LINT_VERSION: v1.45.2
+      GOLANGCI_LINT_VERSION: v1.46.2
       HUGO_VERSION: 0.54.0
       CGO_ENABLED: 0
       LEGO_E2E_TESTS: CI
diff --git a/.golangci.toml b/.golangci.toml
index 91058d7c..24ada860 100644
--- a/.golangci.toml
+++ b/.golangci.toml
@@ -53,7 +53,11 @@
     "maligned", # deprecated
     "scopelint", # deprecated
     "golint", # deprecated
+    "exhaustivestruct", # deprecated
     "cyclop", # duplicate of gocyclo
+    "sqlclosecheck", # not relevant (SQL)
+    "rowserrcheck", # not relevant (SQL)
+    "execinquery", # not relevant (SQL)
     "lll",
     "gosec",
     "dupl", # not relevant
@@ -69,7 +73,7 @@
     "nlreturn", # not relevant
     "wsl", # not relevant
     "exhaustive", # not relevant
-    "exhaustivestruct", # not relevant
+    "exhaustruct", # not relevant
     "makezero", # not relevant
     "ifshort", # not relevant
     "forbidigo", # not relevant
@@ -83,6 +87,7 @@
     "tagliatelle",
     "errname",
     "errchkjson",
+    "nonamedreturns",
   ]
 
 [issues]