From b332a22ae22d0f5cdcfe7ddb8a3250bfc5a8c8cc Mon Sep 17 00:00:00 2001
From: Marco Nenciarini <marco.nenciarini@enterprisedb.com>
Date: Fri, 8 Mar 2024 15:35:35 +0100
Subject: [PATCH] ci: set golangci-lit timeout to 5m by default (#4044)

Signed-off-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com>
(cherry picked from commit f17fe4f3d97d2ff45714f989e75f5be16832498f)
---
 .github/workflows/continuous-integration.yml | 1 -
 .golangci.yml                                | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 0092f5fab9..2a33c713b5 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -159,7 +159,6 @@ jobs:
         uses: golangci/golangci-lint-action@v4
         with:
           version: ${{ env.GOLANGCI_LINT_VERSION }}
-          args: --timeout 4m
 
       - name: Check go mod tidy has no pending changes
         run: |
diff --git a/.golangci.yml b/.golangci.yml
index ba83ff4d6f..5c468906f5 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -102,6 +102,7 @@ linters:
   # - varcheck
 
 run:
+  timeout: 5m
   skip-files: "zz_generated.*"
 
 issues: