Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/golangci/golangci-…
Browse files Browse the repository at this point in the history
…lint-action-6.2.0
  • Loading branch information
thepwagner authored Jan 27, 2025
2 parents 4973c11 + c084014 commit 1e76b52
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
id: gover
run: echo goversion=$(grep "AS apk" Dockerfile.test | awk -F':|-' '!/^#/ {print $2}') >> "$GITHUB_OUTPUT"
- name: Set up Go
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # tag=v5.2.0
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # tag=v5.3.0
with:
go-version: "${{ steps.gover.outputs.goversion }}"
- run: go test -race ./...
Expand All @@ -30,7 +30,7 @@ jobs:
id: gover
run: echo goversion=$(grep "AS apk" Dockerfile.test | awk -F':|-' '!/^#/ {print $2}') >> "$GITHUB_OUTPUT"
- name: Set up Go
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # tag=v5.2.0
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # tag=v5.3.0
with:
go-version: "${{ steps.gover.outputs.goversion }}"
- name: golangci-lint
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
id: gover
run: echo goversion=$(grep "AS apk" Dockerfile.test | awk -F':|-' '!/^#/ {print $2}') >> "$GITHUB_OUTPUT"
- name: Set up Go
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # tag=v5.2.0
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # tag=v5.3.0
with:
go-version: "${{ steps.gover.outputs.goversion }}"
- name: Set up Cosign
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.test
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.23.4 AS deb
FROM golang:1.23.5 AS deb
WORKDIR /app
COPY go.mod .
COPY go.sum .
Expand All @@ -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.23.4-alpine AS apk
FROM docker.io/library/golang:1.23.5-alpine AS apk
ENV CGO_ENABLED=0
WORKDIR /app
COPY go.mod .
Expand Down

0 comments on commit 1e76b52

Please sign in to comment.