From 3b68b0b78715a0c2b9a92218df8d2ae6ba173163 Mon Sep 17 00:00:00 2001 From: Karel Bilek Date: Mon, 25 Mar 2024 13:38:18 +0100 Subject: [PATCH] Update go to latest --- Dockerfile | 2 +- go.mod | 10 ++++++++-- go.sum | 1 - release/linux/Dockerfile.build | 6 +++--- release/macos/Makefile | 6 +++--- release/windows/Makefile | 4 ++-- 6 files changed, 17 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index a20ec174..3c722a6a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.18 +FROM golang:1.22.1 RUN mkdir /trezord-go WORKDIR /trezord-go diff --git a/go.mod b/go.mod index 7a387802..3824d8bd 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,18 @@ module github.com/trezor/trezord-go -go 1.12 +go 1.22.1 require ( - github.com/BurntSushi/toml v0.3.1 // indirect github.com/gorilla/csrf v1.7.0 github.com/gorilla/handlers v1.5.1 github.com/gorilla/mux v1.8.0 gopkg.in/natefinch/lumberjack.v2 v2.0.0 +) + +require ( + github.com/BurntSushi/toml v0.3.1 // indirect + github.com/felixge/httpsnoop v1.0.1 // indirect + github.com/gorilla/securecookie v1.1.1 // indirect + github.com/pkg/errors v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/go.sum b/go.sum index 6aa104f9..5017d8ac 100644 --- a/go.sum +++ b/go.sum @@ -12,7 +12,6 @@ github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyC github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= diff --git a/release/linux/Dockerfile.build b/release/linux/Dockerfile.build index 8ce35989..310046db 100644 --- a/release/linux/Dockerfile.build +++ b/release/linux/Dockerfile.build @@ -1,11 +1,11 @@ FROM messense/rust-musl-cross:aarch64-musl AS go-arm64-musl -COPY --from=golang:1.19.1 /usr/local/go/ /usr/local/go/ +COPY --from=golang:1.22.1 /usr/local/go/ /usr/local/go/ ENV TREZORD_BUILD=go-arm64-musl FROM messense/rust-musl-cross:i686-musl AS go-386-musl -COPY --from=golang:1.19.1 /usr/local/go/ /usr/local/go/ +COPY --from=golang:1.22.1 /usr/local/go/ /usr/local/go/ ENV TREZORD_BUILD=go-386-musl FROM messense/rust-musl-cross:x86_64-musl AS go-amd64-musl -COPY --from=golang:1.19.1 /usr/local/go/ /usr/local/go/ +COPY --from=golang:1.22.1 /usr/local/go/ /usr/local/go/ ENV TREZORD_BUILD=go-amd64-musl diff --git a/release/macos/Makefile b/release/macos/Makefile index 8a12773b..a7e172aa 100644 --- a/release/macos/Makefile +++ b/release/macos/Makefile @@ -20,14 +20,14 @@ clean: -v $(IMPORT_PATH):/trezord \ -w /trezord \ -e CGO_ENABLED=1 \ - docker.elastic.co/beats-dev/golang-crossbuild:1.19-darwin-debian10 \ + docker.elastic.co/beats-dev/golang-crossbuild:1.22.1-darwin-debian10 \ --build-cmd "go build -o release/macos/build/trezord-amd64 -ldflags=-s" \ -p "darwin/amd64" docker run --rm \ -v $(IMPORT_PATH):/trezord \ -w /trezord \ -e CGO_ENABLED=1 \ - docker.elastic.co/beats-dev/golang-crossbuild:1.19-darwin-arm64-debian10 \ + docker.elastic.co/beats-dev/golang-crossbuild:1.22.1-darwin-arm64-debian10 \ --build-cmd "go build -o release/macos/build/trezord-arm64 -ldflags=-s" \ -p "darwin/arm64" docker run --rm \ @@ -35,7 +35,7 @@ clean: -w /trezord \ -e CGO_ENABLED=1 \ --entrypoint /trezord/release/macos/build-fat.sh \ - docker.elastic.co/beats-dev/golang-crossbuild:1.19-darwin-arm64-debian10 + docker.elastic.co/beats-dev/golang-crossbuild:1.22.1-darwin-arm64-debian10 cp ../../VERSION build .package: .binary .docker-image diff --git a/release/windows/Makefile b/release/windows/Makefile index 008c03b4..33c398e2 100644 --- a/release/windows/Makefile +++ b/release/windows/Makefile @@ -19,7 +19,7 @@ clean: -w /trezord \ -e CGO_ENABLED=1 \ -e CGO_CFLAGS="-D_WIN32_WINNT=0x0600" \ - docker.elastic.co/beats-dev/golang-crossbuild:1.19-main-debian10 \ + docker.elastic.co/beats-dev/golang-crossbuild:1.22.1-main-debian10 \ --build-cmd "go build -o release/windows/build/trezord-64b.exe -ldflags=\"-H=windowsgui\"" \ -p "windows/amd64" docker run --rm \ @@ -27,7 +27,7 @@ clean: -w /trezord \ -e CGO_ENABLED=1 \ -e CGO_CFLAGS="-D_WIN32_WINNT=0x0600" \ - docker.elastic.co/beats-dev/golang-crossbuild:1.19-main-debian10 \ + docker.elastic.co/beats-dev/golang-crossbuild:1.22.1-main-debian10 \ --build-cmd "go build -o release/windows/build/trezord-32b.exe -ldflags=\"-H=windowsgui\"" \ -p "windows/386" cp ../../VERSION build