gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

set the qlogged quic-go version when building the interop runner image

Browse Source
This commit is contained in:
Marten Seemann
2021-02-07 19:57:42 +08:00
parent 218b204e1b
commit 0437acd41d
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
interop/Dockerfile
View File

@@ -19,8 +19,8 @@ RUN git clone https://github.com/lucas-clemente/quic-go && \
WORKDIR /quic-go WORKDIR /quic-go
RUN git rev-parse HEAD > commit.txt RUN git rev-parse HEAD > commit.txt
RUN go build -o server interop/server/main.go && \ RUN go build -o server -ldflags="-X github.com/lucas-clemente/quic-go/qlog.quicGoVersion=$(git describe --always --long --dirty)" interop/server/main.go
go build -o client interop/client/main.go RUN go build -o client -ldflags="-X github.com/lucas-clemente/quic-go/qlog.quicGoVersion=$(git describe --always --long --dirty)" interop/client/main.go
FROM martenseemann/quic-network-simulator-endpoint:latest FROM martenseemann/quic-network-simulator-endpoint:latest

10
qlog/qlog.go
View File

@@ -18,9 +18,15 @@ import (
"github.com/francoispqt/gojay" "github.com/francoispqt/gojay"
) )
// Setting of this only works when quic-go is used as a library.
// When building a binary from this repository, the version can be set using the following go build flag:
// -ldflags="-X github.com/lucas-clemente/quic-go/qlog.quicGoVersion=foobar"
var quicGoVersion = "(devel)" var quicGoVersion = "(devel)"
func init() { func init() {
if quicGoVersion != "(devel)" { // variable set by ldflags
return
}
info, ok := debug.ReadBuildInfo() info, ok := debug.ReadBuildInfo()
if !ok { // no build info available. This happens when quic-go is not used as a library. if !ok { // no build info available. This happens when quic-go is not used as a library.
return return
@@ -29,8 +35,12 @@ func init() {
if d.Path == "github.com/lucas-clemente/quic-go" { if d.Path == "github.com/lucas-clemente/quic-go" {
quicGoVersion = d.Version quicGoVersion = d.Version
if d.Replace != nil { if d.Replace != nil {
if len(d.Replace.Version) > 0 {
quicGoVersion = d.Version
} else {
quicGoVersion += " (replaced)" quicGoVersion += " (replaced)"
} }
}
break break
} }
} }