From a18f77bfad087c6ce85021defb4d4a747ba3d389 Mon Sep 17 00:00:00 2001
From: Chris Cummer <chriscummer@me.com>
Date: Thu, 26 Nov 2020 21:06:11 -0800
Subject: [PATCH] Back onto grandcolline/golang-github-actions (#1030)

Signed-off-by: Chris Cummer <chriscummer@me.com>
---
 .github/workflows/golangci-lint.yml |  4 ++--
 .github/workflows/staticcheck.yml   | 12 ++++++------
 .golangci.yml                       |  3 +++
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index 0034fcc9..5be7d1e9 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -13,8 +13,8 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v1
+        uses: golangci/golangci-lint-action@v2
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.26
+          version: v1.29
           args: ./...
\ No newline at end of file
diff --git a/.github/workflows/staticcheck.yml b/.github/workflows/staticcheck.yml
index c44e046f..a04f0a66 100644
--- a/.github/workflows/staticcheck.yml
+++ b/.github/workflows/staticcheck.yml
@@ -8,7 +8,7 @@ jobs:
     steps:
     - uses: actions/checkout@master
     - name: check
-      uses: senorprogrammer/golang-github-actions@2614d7f
+      uses: grandcolline/golang-github-actions@4356d04
       with:
         run: imports
         token: ${{ secrets.GITHUB_TOKEN }}
@@ -19,7 +19,7 @@ jobs:
     steps:
     - uses: actions/checkout@master
     - name: check
-      uses: senorprogrammer/golang-github-actions@2614d7f
+      uses: grandcolline/golang-github-actions@4356d04
       with:
         run: errcheck
         token: ${{ secrets.GITHUB_TOKEN }}
@@ -30,7 +30,7 @@ jobs:
     #steps:
     #- uses: actions/checkout@master
     #- name: check
-      #uses: senorprogrammer/golang-github-actions@2614d7f
+      #uses: grandcolline/golang-github-actions@4356d04
       #with:
         #run: lint
         #token: ${{ secrets.GITHUB_TOKEN }}
@@ -41,7 +41,7 @@ jobs:
     steps:
     - uses: actions/checkout@master
     - name: check
-      uses: senorprogrammer/golang-github-actions@2614d7f
+      uses: grandcolline/golang-github-actions@4356d04
       with:
         run: shadow
         token: ${{ secrets.GITHUB_TOKEN }}
@@ -52,7 +52,7 @@ jobs:
     steps:
     - uses: actions/checkout@master
     - name: check
-      uses: senorprogrammer/golang-github-actions@2614d7f
+      uses: grandcolline/golang-github-actions@4356d04
       with:
         run: staticcheck
         token: ${{ secrets.GITHUB_TOKEN }}
@@ -63,7 +63,7 @@ jobs:
     #steps:
     #- uses: actions/checkout@master
     #- name: check
-      #uses: senorprogrammer/golang-github-actions@2614d7f
+      #uses: grandcolline/golang-github-actions@4356d04
       #with:
         #run: sec
         #token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.golangci.yml b/.golangci.yml
index fe25baee..18542322 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,3 +1,6 @@
+run:
+  timeout: 2m
+
 linters:
   enable:
     - vet