diff --git a/.github/workflows/go122.yml b/.github/workflows/go122.yml index d1d0d8b..b7ac143 100644 --- a/.github/workflows/go122.yml +++ b/.github/workflows/go122.yml @@ -1,26 +1,35 @@ -name: go1.22 +name: Go CI on: push: - branches: [ master ] + branches: [ '**' ] pull_request: - branches: [ master ] + branches: [ main ] jobs: - build: - name: Build in Go1.22 + name: Build and Test runs-on: ubuntu-latest steps: + - name: Check out code + uses: actions/checkout@v4 - - name: Set up Go 1.22.5 + - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.22.5 + go-version: '1.22.5' id: go - - name: Check out code into the Go module directory - uses: actions/checkout@v4 + - name: Cache Go modules + uses: actions/cache@v3 + with: + path: ~/go/pkg/mod + key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} + restore-keys: | + ${{ runner.os }}-go- + + - name: Get dependencies + run: go mod download - - name: Test - run: go test -v -cover . + - name: Run tests + run: go test -v -cover ./... diff --git a/Dockerfile b/Dockerfile index d30844d..253c668 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ -FROM golang:1.22-alpine as builder +FROM golang:1.22-alpine3.20 as builder COPY . /src WORKDIR /src/cmd RUN apk add --no-cache git ca-certificates && \ go build -v . -FROM alpine:3.20.2 +FROM alpine:3.20 COPY --from=builder /src/cmd /bin/godolint -ENTRYPOINT ["/bin/godolint"] \ No newline at end of file +ENTRYPOINT ["/bin/godolint"] diff --git a/go.mod b/go.mod index 0545077..ac66100 100644 --- a/go.mod +++ b/go.mod @@ -2,12 +2,14 @@ module github.com/zabio3/godolint go 1.22.5 -require github.com/moby/buildkit v0.15.1 +require ( + github.com/distribution/reference v0.6.0 + github.com/moby/buildkit v0.15.1 +) require ( github.com/agext/levenshtein v1.2.3 // indirect github.com/containerd/typeurl/v2 v2.1.1 // indirect - github.com/distribution/reference v0.6.0 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect diff --git a/go.sum b/go.sum index 82eab3b..598028c 100644 --- a/go.sum +++ b/go.sum @@ -16,8 +16,6 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/moby/buildkit v0.14.1 h1:2epLCZTkn4CikdImtsLtIa++7DzCimrrZCT1sway+oI= -github.com/moby/buildkit v0.14.1/go.mod h1:1XssG7cAqv5Bz1xcGMxJL123iCv5TYN4Z/qf647gfuk= github.com/moby/buildkit v0.15.1 h1:J6wrew7hphKqlq1wuu6yaUb/1Ra7gEzDAovylGztAKM= github.com/moby/buildkit v0.15.1/go.mod h1:Yis8ZMUJTHX9XhH9zVyK2igqSHV3sxi3UN0uztZocZk= github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0= @@ -30,8 +28,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/tonistiigi/go-csvvalue v0.0.0-20240710180619-ddb21b71c0b4 h1:7I5c2Ig/5FgqkYOh/N87NzoyI9U15qUPXhDD8uCupv8= github.com/tonistiigi/go-csvvalue v0.0.0-20240710180619-ddb21b71c0b4/go.mod h1:278M4p8WsNh3n4a1eqiFcV2FGk7wE5fwUpUom9mK9lE= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=