From bd3905900de92c322bbcec37bd6eca9f4657fc66 Mon Sep 17 00:00:00 2001 From: Yann Hamon Date: Tue, 30 Jul 2024 23:56:54 +0200 Subject: [PATCH] Update Go, Goreleaser, Alpine, ... (#54) --- Dockerfile-alpine | 2 +- Makefile | 10 +++++----- go.mod | 4 ++-- go.sum | 4 ++-- vendor/golang.org/x/xerrors/LICENSE | 4 ++-- vendor/modules.txt | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Dockerfile-alpine b/Dockerfile-alpine index a1aff5a..758b6d2 100644 --- a/Dockerfile-alpine +++ b/Dockerfile-alpine @@ -1,4 +1,4 @@ -FROM alpine:3.19 +FROM alpine:3.20.2 MAINTAINER Yann HAMON RUN apk add ca-certificates COPY redis-dump-go / diff --git a/Makefile b/Makefile index 31eec73..7d64d08 100644 --- a/Makefile +++ b/Makefile @@ -34,20 +34,20 @@ push-image: docker push ghcr.io/yannh/redis-dump-go:${RELEASE_VERSION} docker-test: - docker run -t -v $$PWD:/go/src/github.com/yannh/redis-dump-go -w /go/src/github.com/yannh/redis-dump-go golang:1.21 make test + docker run -t -v $$PWD:/go/src/github.com/yannh/redis-dump-go -w /go/src/github.com/yannh/redis-dump-go golang:1.22.5 make test docker-build-static: - docker run -t -v $$PWD:/go/src/github.com/yannh/redis-dump-go -w /go/src/github.com/yannh/redis-dump-go golang:1.21 make build-static + docker run -t -v $$PWD:/go/src/github.com/yannh/redis-dump-go -w /go/src/github.com/yannh/redis-dump-go golang:1.22.5 make build-static docker-build-generator-static: - docker run -t -v $$PWD:/go/src/github.com/yannh/redis-dump-go -w /go/src/github.com/yannh/redis-dump-go golang:1.21 make build-generator-static + docker run -t -v $$PWD:/go/src/github.com/yannh/redis-dump-go -w /go/src/github.com/yannh/redis-dump-go golang:1.22.5 make build-generator-static goreleaser-build-static: - docker run -t -e GOOS=linux -e GOARCH=amd64 -v $$PWD:/go/src/github.com/yannh/redis-dump-go -w /go/src/github.com/yannh/redis-dump-go goreleaser/goreleaser:v1.22.1 build --single-target --skip-post-hooks --rm-dist --snapshot + docker run -t -e GOOS=linux -e GOARCH=amd64 -v $$PWD:/go/src/github.com/yannh/redis-dump-go -w /go/src/github.com/yannh/redis-dump-go goreleaser/goreleaser:v2.1.0 build --single-target --clean --snapshot cp dist/redis-dump-go_linux_amd64_v1/redis-dump-go bin/ release: - docker run -e GITHUB_TOKEN -e GIT_OWNER -t -v /var/run/docker.sock:/var/run/docker.sock -v $$PWD:/go/src/github.com/yannh/redis-dump-go -w /go/src/github.com/yannh/redis-dump-go goreleaser/goreleaser:v1.22.1 release --rm-dist + docker run -e GITHUB_TOKEN -e GIT_OWNER -t -v /var/run/docker.sock:/var/run/docker.sock -v $$PWD:/go/src/github.com/yannh/redis-dump-go -w /go/src/github.com/yannh/redis-dump-go goreleaser/goreleaser:v1.22.1 release --clean acceptance-tests: docker-build-static docker-build-generator-static docker-compose run tests diff --git a/go.mod b/go.mod index ac339c6..844d622 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,7 @@ module github.com/yannh/redis-dump-go -go 1.21 +go 1.22 require github.com/mediocregopher/radix/v3 v3.8.1 -require golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect +require golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect diff --git a/go.sum b/go.sum index 680320a..33f2c9c 100644 --- a/go.sum +++ b/go.sum @@ -7,5 +7,5 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU= -golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= +golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 h1:LLhsEBxRTBLuKlQxFBYUOU8xyFgXv6cOTp2HASDlsDk= +golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= diff --git a/vendor/golang.org/x/xerrors/LICENSE b/vendor/golang.org/x/xerrors/LICENSE index e4a47e1..c3c8b7d 100644 --- a/vendor/golang.org/x/xerrors/LICENSE +++ b/vendor/golang.org/x/xerrors/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2019 The Go Authors. All rights reserved. +Copyright 2019 The Go Authors. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -10,7 +10,7 @@ notice, this list of conditions and the following disclaimer. copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Google Inc. nor the names of its + * Neither the name of Google LLC nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/vendor/modules.txt b/vendor/modules.txt index 762c16b..bace14b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -5,7 +5,7 @@ github.com/mediocregopher/radix/v3/internal/bytesutil github.com/mediocregopher/radix/v3/resp github.com/mediocregopher/radix/v3/resp/resp2 github.com/mediocregopher/radix/v3/trace -# golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 +# golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 ## explicit; go 1.18 golang.org/x/xerrors golang.org/x/xerrors/internal