From 5046d152da7c74602ae4c78d1f39b181a97bbb9e Mon Sep 17 00:00:00 2001
From: Pulumi Bot <30351955+pulumi-bot@users.noreply.github.com>
Date: Fri, 30 Aug 2024 06:51:08 +0100
Subject: [PATCH] [internal] Update GitHub Actions workflow files (#152)

---
 .golangci.yml | 8 +++++---
 Makefile      | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 988859ab..6ec2c621 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -10,17 +10,19 @@ linters:
   - govet
   - ineffassign
   - lll
-  - megacheck
+  - gosimple
+  - staticcheck
   - misspell
   - nakedret
   - revive
   - unconvert
   - unused
   enable-all: false
-run:
-  skip-files:
+issues:
+  exclude-files:
   - schema.go
   - pulumiManifest.go
+run:
   timeout: 20m
 linters-settings:
   gci:
diff --git a/Makefile b/Makefile
index 703d67a2..be589821 100644
--- a/Makefile
+++ b/Makefile
@@ -122,12 +122,12 @@ install_plugins: .pulumi/bin/pulumi
 	.pulumi/bin/pulumi plugin install converter terraform 1.0.16
 
 lint_provider: provider
-	cd provider && golangci-lint run -c ../.golangci.yml
+	cd provider && golangci-lint run --path-prefix provider -c ../.golangci.yml
 
 # `lint_provider.fix` is a utility target meant to be run manually
 # that will run the linter and fix errors when possible.
 lint_provider.fix:
-	cd provider && golangci-lint run -c ../.golangci.yml --fix
+	cd provider && golangci-lint run --path-prefix provider -c ../.golangci.yml --fix
 
 # `make provider_no_deps` builds the provider binary directly, without ensuring that
 # `cmd/pulumi-resource-meraki/schema.json` is valid and up to date.