Skip to content

Commit

Permalink
Merge pull request GoogleCloudPlatform#1302 from acpana/acpana/bump-g…
Browse files Browse the repository at this point in the history
…olanci-lint

chore:ci: bump golangci-lint and add make target
  • Loading branch information
google-oss-prow[bot] authored Feb 28, 2024
2 parents 30b820b + f4c743a commit 10b4079
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ jobs:
- name: golangci-lint
uses: golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc # v3.7.0
with:
version: v1.54.1 # should match the version in Makefile
version: v1.54.2 # should match the version in Makefile
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ UNMANAGED_DETECTOR_IMG ?= gcr.io/${PROJECT_ID}/unmanageddetector:${SHORT_SHA}
GOLANGCI_LINT_CACHE := $(shell pwd)/.tmp/golangci-lint
# When updating this, make sure to update the corresponding action in
# ./github/workflows/lint.yaml
GOLANGCI_LINT_VERSION := v1.54.1
GOLANGCI_LINT_VERSION := v1.54.2

# Use Docker BuildKit when building images to allow usage of 'setcap' in
# multi-stage builds (https://github.com/moby/moby/issues/38132)
Expand Down Expand Up @@ -211,7 +211,7 @@ ensure:

# Should run all needed commands before any PR is sent out.
.PHONY: ready-pr
ready-pr: manifests resource-docs generate-go-client
ready-pr: lint manifests resource-docs generate-go-client

# Upgrades dcl dependencies
.PHONY: upgrade-dcl
Expand Down

0 comments on commit 10b4079

Please sign in to comment.