Skip to content

Commit 7c82f2e

Browse files
authored
chore: bump down x/sync to v0.16 (#18)
go.expect.digital/cache supports the last three versions of golang - from 1.23. Unfortunately, x/sync v0.17 requires go1.24.
1 parent 7898204 commit 7c82f2e

5 files changed

Lines changed: 24 additions & 9 deletions

File tree

.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
EARTHLY_INSTALLATION_NAME=go-cache

.github/workflows/check.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
go: [1.23, 1.24, 1.25]
1616
continue-on-error: true
1717
steps:
18-
- uses: earthly/actions-setup@v1
18+
- uses: EarthBuild/actions-setup@main
1919
with:
2020
version: ${{ env.EARTHLY_VERSION }}
2121
use-cache: false
@@ -25,3 +25,5 @@ jobs:
2525
run: earthly --ci +lint
2626
- name: Test
2727
run: earthly --ci +test
28+
- name: Go Vulnerability Check
29+
run: earthly --ci +govulncheck

Earthfile

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
VERSION 0.8
2-
ARG go_version=1.25.1-alpine@sha256:b6ed3fd0452c0e9bcdef5597f29cc1418f61672e9d3a2f55bf02e7222c014abd
3-
FROM golang:$go_version
2+
ARG go_version=1.25.1
3+
FROM golang:$go_version-alpine
4+
WORKDIR /src
45

56
src:
67
ENV CGO_ENABLED=0
@@ -12,9 +13,10 @@ src:
1213
go mod download
1314
SAVE ARTIFACT /src
1415

16+
# lint runs all linters for golang
1517
lint:
16-
ARG golangci_lint_version=2.4.0-alpine
17-
FROM golangci/golangci-lint:v$golangci_lint_version
18+
ARG golangci_lint_version=2.4.0
19+
FROM golangci/golangci-lint:v$golangci_lint_version-alpine
1820
WORKDIR /src
1921
COPY .golangci.yml .
2022
COPY --dir +src/src /
@@ -24,13 +26,25 @@ lint:
2426
--mount type=cache,id=golangci,target=/root/.cache/golangci_lint \
2527
golangci-lint run --timeout 3m
2628

29+
# test runs unit tests
2730
test:
2831
FROM +src
2932
RUN \
3033
--mount=type=cache,id=go-mod,target=/go/pkg/mod \
3134
--mount=type=cache,id=go-build,target=/root/.cache/go-build \
3235
go test ./... -count 10
3336

37+
# govulncheck checks golang vulnerabilities
38+
govulncheck:
39+
RUN apk add git
40+
# renovate: datasource=go depName=golang.org/x/vuln/cmd/govulncheck
41+
ARG govulncheck_version=v1.1.4
42+
RUN go install golang.org/x/vuln/cmd/govulncheck@$govulncheck_version
43+
COPY --dir +src/src /
44+
RUN govulncheck ./...
45+
46+
# check verifies code quality by running linters and tests
3447
check:
3548
BUILD +lint
3649
BUILD +test
50+
BUILD +govulncheck

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module go.expect.digital/cache
22

3-
go 1.24.0
3+
go 1.23.0
44

55
toolchain go1.25.1
66

7-
require golang.org/x/sync v0.17.0
7+
require golang.org/x/sync v0.16.0

go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
22
golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
3-
golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
4-
golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=

0 commit comments

Comments
 (0)