Merge branch 'main' into dependabot/docker/golang-1.23.0

Shopify · Aug 14, 2024 · e9558b5 · e9558b5
2 parents d5a9ecf + 2207a1c
commit e9558b5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -36,7 +36,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # tag=v3.7.1
         with:
-          version: v1.55.2
+          version: v1.60.1
           args: --timeout=5m
 
   integration:

diff --git a/Dockerfile.test b/Dockerfile.test
@@ -9,7 +9,7 @@ RUN [ "go", "test", "-v", "./internal/cli/...", "-run", "TestGenerate_InstallDeb
 
 # This line also determines the golang version used for GitHub Actions CI
 # Use the qualified image name, so Dependabot treats this separate from "golang" above.
-FROM docker.io/library/golang:1.22.6-alpine AS apk
+FROM docker.io/library/golang:1.23.0-alpine AS apk
 ENV CGO_ENABLED=0
 WORKDIR /app
 COPY go.mod .