From cd24df5727c54de6671f83b44b7527f3c74f122f Mon Sep 17 00:00:00 2001
From: Ryan <me@hackerc.at>
Date: Fri, 12 Nov 2021 21:48:10 +0100
Subject: [PATCH] ci(golangci-lint): switch to latest (#870)

* ci(golangci-lint): switch to latest

remove schema override since it was fixed in upstream

Signed-off-by: hackercat <me@hackerc.at>

* fix: apply lint fixes
---
 .github/workflows/checks.yml | 2 +-
 .golangci.yml                | 7 ++-----
 pkg/runner/runner_test.go    | 2 +-
 pkg/runner/step_context.go   | 2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 52ad54d7..21d520e9 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -21,7 +21,7 @@ jobs:
         env:
           CGO_ENABLED: 0
         with:
-          version: v1.40.0
+          version: latest
       - uses: github/super-linter@v3
         env:
           DEFAULT_BRANCH: master
diff --git a/.golangci.yml b/.golangci.yml
index 3304591e..c18887f9 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,7 +1,4 @@
-# yaml-language-server: $schema=https://schemastore.pages.dev/schemas/json/golangci-lint.json
-# Your editor might complain about invalid types, but this is correct config
-# above schema should prevent editor from "shouting" about this
-# Minimum golangci-lint version required: v1.40.0
+# Minimum golangci-lint version required: v1.42.0
 run:
   timeout: 3m
 
@@ -32,7 +29,7 @@ linters:
   enable:
     - megacheck
     - govet
-    - golint
+    - revive
     - gocyclo
     - gosec
     - unconvert
diff --git a/pkg/runner/runner_test.go b/pkg/runner/runner_test.go
index aacf4333..cabdaec5 100644
--- a/pkg/runner/runner_test.go
+++ b/pkg/runner/runner_test.go
@@ -16,7 +16,7 @@ import (
 	"github.com/nektos/act/pkg/model"
 )
 
-var baseImage string = "node:12-buster-slim"
+var baseImage = "node:12-buster-slim"
 
 func init() {
 	if p := os.Getenv("ACT_TEST_IMAGE"); p != "" {
diff --git a/pkg/runner/step_context.go b/pkg/runner/step_context.go
index b06df3e7..d31f2d7e 100644
--- a/pkg/runner/step_context.go
+++ b/pkg/runner/step_context.go
@@ -560,7 +560,7 @@ func (sc *StepContext) execAsDocker(ctx context.Context, action *model.Action, a
 
 		if !correctArchExists {
 			log.Debugf("image '%s' for architecture '%s' will be built from context '%s", image, rc.Config.ContainerArchitecture, contextDir)
-			var actionContainer container.Container = nil
+			var actionContainer container.Container
 			if localAction {
 				actionContainer = sc.RunContext.JobContainer
 			}