From bf56cb56fe44fdc505017f2e3b9f3335691fa48a Mon Sep 17 00:00:00 2001 From: Ales Stimec Date: Mon, 9 Dec 2024 14:49:42 +0100 Subject: [PATCH] chore: updates golangci-lint version --- .github/workflows/static-analysis.yaml | 2 +- internal/provider/resource_application_test.go | 8 ++++---- tools/static-analysis.sh | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml index 35b52d67..c43a40cc 100644 --- a/.github/workflows/static-analysis.yaml +++ b/.github/workflows/static-analysis.yaml @@ -75,7 +75,7 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@v6 with: - version: v1.54.0 + version: v1.61.0 args: --print-issued-lines=true # This runs copyright-check against the codebase diff --git a/internal/provider/resource_application_test.go b/internal/provider/resource_application_test.go index 89cf2a3d..a3a2c8a8 100644 --- a/internal/provider/resource_application_test.go +++ b/internal/provider/resource_application_test.go @@ -1037,7 +1037,7 @@ resource "juju_application" "this" { name = "test-app" charm { name = "ubuntu-lite" - revision = 10 + revision = 2 } trust = true @@ -1056,7 +1056,7 @@ resource "juju_application" "this" { name = "test-app" charm { name = "ubuntu-lite" - revision = 10 + revision = 2 } trust = true expose{} @@ -1097,7 +1097,7 @@ resource "juju_application" "this" { name = "test-app" charm { name = "ubuntu-lite" - revision = 10 + revision = 2 } trust = true expose{} @@ -1191,7 +1191,7 @@ resource "juju_application" "{{.AppName}}" { constraints = "{{.Constraints}}" charm { name = "ubuntu-lite" - revision = 10 + revision = 2 } endpoint_bindings = {{.EndpointBindings}} } diff --git a/tools/static-analysis.sh b/tools/static-analysis.sh index b1aa07d2..092502d5 100755 --- a/tools/static-analysis.sh +++ b/tools/static-analysis.sh @@ -118,8 +118,8 @@ run_linter() { run_go() { VER=$(golangci-lint --version | tr -s ' ' | cut -d ' ' -f 4 | cut -d '.' -f 1,2) - if [[ ${VER} != "1.53" ]] && [[ ${VER} != "v1.53" ]]; then - (echo >&2 -e '\nError: golangci-lint version does not match 1.53. Please upgrade/downgrade to the right version.') + if [[ ${VER} != "1.61.0" ]] && [[ ${VER} != "v1.61.0" ]]; then + (echo >&2 -e '\nError: golangci-lint version does not match 1.61.0. Please upgrade/downgrade to the right version.') exit 1 fi OUT=$(golangci-lint run -c .github/golangci-lint.config.yaml 2>&1)