From c0d67f4c45298e96cd24e58fb6b0f0be026ef807 Mon Sep 17 00:00:00 2001 From: Richard87 Date: Wed, 19 Jun 2024 10:02:17 +0200 Subject: [PATCH] update alpine to 3.20, linting to 1.58.2 --- .github/workflows/pr.yml | 4 ++-- Dockerfile | 2 +- Makefile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index cd98284..16fd938 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -18,7 +18,7 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@v4 with: - version: v1.55.2 + version: v1.58.2 test: name: Unit Test @@ -41,7 +41,7 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 - - uses: azure/setup-helm@b7246b12e77f7134dc2d460a3d5bad15bbe29390 # v4.1.0 + - uses: azure/setup-helm@v4 - name: Helm Lint run: helm lint charts/radix-oauth-guard diff --git a/Dockerfile b/Dockerfile index 1987fc5..74c1bb8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.22-alpine3.19 as builder +FROM --platform=$BUILDPLATFORM golang:1.22-alpine3.20 as builder # Define target arch variables so we can use them while crosscompiling, will be set automatically ARG TARGETOS ARG TARGETARCH diff --git a/Makefile b/Makefile index 073d00a..4009ed0 100644 --- a/Makefile +++ b/Makefile @@ -25,5 +25,5 @@ HAS_GOLANGCI_LINT := $(shell command -v golangci-lint;) bootstrap: ifndef HAS_GOLANGCI_LINT - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.55.2 + go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.58.2 endif