Skip to content

Update go to latest #302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
karelbilek wants to merge 1 commit into from
Closed

Update go to latest #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.18
FROM golang:1.22.1

RUN mkdir /trezord-go
WORKDIR /trezord-go
Expand Down
10 changes: 8 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
)
1 change: 0 additions & 1 deletion go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
6 changes: 3 additions & 3 deletions release/linux/Dockerfile.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions release/macos/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,22 @@ 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 \
-v $(IMPORT_PATH):/trezord \
-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
Expand Down
4 changes: 2 additions & 2 deletions release/windows/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ 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 \
-v $(IMPORT_PATH):/trezord \
-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
Expand Down