File tree 4 files changed +8
-14
lines changed
4 files changed +8
-14
lines changed Original file line number Diff line number Diff line change @@ -121,8 +121,8 @@ jobs:
121
121
```
122
122
tar -xvzf vendor.tar.gz
123
123
tar -xvzf lnd-source-${{ env.RELEASE_VERSION }}.tar.gz
124
- GO111MODULE=on go install -v -mod=vendor -ldflags "-X github.com/lightningnetwork/lnd/build.Commit=${{ env.RELEASE_VERSION }}" ./cmd/lnd
125
- GO111MODULE=on go install -v -mod=vendor -ldflags "-X github.com/lightningnetwork/lnd/build.Commit=${{ env.RELEASE_VERSION }}" ./cmd/lncli
124
+ go install -v -mod=vendor -ldflags "-X github.com/lightningnetwork/lnd/build.Commit=${{ env.RELEASE_VERSION }}" ./cmd/lnd
125
+ go install -v -mod=vendor -ldflags "-X github.com/lightningnetwork/lnd/build.Commit=${{ env.RELEASE_VERSION }}" ./cmd/lncli
126
126
```
127
127
128
128
The `-mod=vendor` flag tells the `go build` command that it doesn't need to fetch the dependencies, and instead, they're all enclosed in the local vendor directory.
Original file line number Diff line number Diff line change @@ -25,19 +25,14 @@ COMMIT := $(shell git describe --tags --dirty)
25
25
ACTIVE_GO_VERSION := $(shell $(GOCC ) version | sed -nre 's/^[^0-9]* (([0-9]+\.) *[0-9]+).*/\1/p')
26
26
ACTIVE_GO_VERSION_MINOR := $(shell echo $(ACTIVE_GO_VERSION ) | cut -d. -f2)
27
27
28
- LOOPVARFIX :=
29
- ifeq ($(shell expr $(ACTIVE_GO_VERSION_MINOR ) \>= 21) , 1)
30
- LOOPVARFIX := GOEXPERIMENT=loopvar
31
- endif
32
-
33
28
# GO_VERSION is the Go version used for the release build, docker files, and
34
29
# GitHub Actions. This is the reference version for the project. All other Go
35
30
# versions are checked against this version.
36
31
GO_VERSION = 1.23.6
37
32
38
- GOBUILD := $(LOOPVARFIX ) $( GOCC ) build -v
39
- GOINSTALL := $(LOOPVARFIX ) $( GOCC ) install -v
40
- GOTEST := $(LOOPVARFIX ) $( GOCC ) test
33
+ GOBUILD := $(GOCC ) build -v
34
+ GOINSTALL := $(GOCC ) install -v
35
+ GOTEST := $(GOCC ) test
41
36
42
37
GOFILES_NOVENDOR = $(shell find . -type f -name '* .go' -not -path "./vendor/* " -not -name "* pb.go" -not -name "* pb.gw.go" -not -name "* .pb.json.go")
43
38
Original file line number Diff line number Diff line change @@ -7,7 +7,6 @@ MAINTAINER Olaoluwa Osuntokun <laolu@lightning.engineering>
7
7
# Golang build related environment variables that are static and used for all
8
8
# architectures/OSes.
9
9
ENV GODEBUG netdns=cgo
10
- ENV GO111MODULE=auto
11
10
ENV CGO_ENABLED=0
12
11
13
12
# Set up cache directories. Those will be mounted from the host system to speed
Original file line number Diff line number Diff line change @@ -98,7 +98,7 @@ function check_tag_correct() {
98
98
fi
99
99
100
100
# Build lnd to extract version.
101
- env GOEXPERIMENT=loopvar go build ${PKG} /cmd/lnd
101
+ go build ${PKG} /cmd/lnd
102
102
103
103
# Extract version command output.
104
104
lnd_version_output=$( ./lnd --version)
@@ -189,8 +189,8 @@ required Go version ($goversion)."
189
189
pushd " ${dir} "
190
190
191
191
green " - Building: ${os} ${arch} ${arm} with build tags '${buildtags} '"
192
- env GOEXPERIMENT=loopvar CGO_ENABLED=0 GOOS=$os GOARCH=$arch GOARM=$arm go build -v -trimpath -ldflags=" ${ldflags} " -tags=" ${buildtags} " ${PKG} /cmd/lnd
193
- env GOEXPERIMENT=loopvar CGO_ENABLED=0 GOOS=$os GOARCH=$arch GOARM=$arm go build -v -trimpath -ldflags=" ${ldflags} " -tags=" ${buildtags} " ${PKG} /cmd/lncli
192
+ env CGO_ENABLED=0 GOOS=$os GOARCH=$arch GOARM=$arm go build -v -trimpath -ldflags=" ${ldflags} " -tags=" ${buildtags} " ${PKG} /cmd/lnd
193
+ env CGO_ENABLED=0 GOOS=$os GOARCH=$arch GOARM=$arm go build -v -trimpath -ldflags=" ${ldflags} " -tags=" ${buildtags} " ${PKG} /cmd/lncli
194
194
popd
195
195
196
196
# Add the hashes for the individual binaries as well for easy verification
You can’t perform that action at this time.
0 commit comments