Skip to content

Commit 4602189

Browse files
committed
multi: remove obsolete Go environment variables
Since we're using Go 1.22 everywhere now, these values are actually the default now and we don't need to set them anymore.
1 parent 60369ac commit 4602189

File tree

5 files changed

+9
-10
lines changed

5 files changed

+9
-10
lines changed

.github/workflows/release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ jobs:
136136
```
137137
tar -xvzf vendor.tar.gz
138138
tar -xvzf tapd-source-${{ env.RELEASE_VERSION }}.tar.gz
139-
GO111MODULE=on go install -v -mod=vendor -ldflags "-X github.com/lightninglabs/taproot-assets/build.Commit=${{ env.RELEASE_VERSION }}" ./cmd/tapd
140-
GO111MODULE=on go install -v -mod=vendor -ldflags "-X github.com/lightninglabs/taproot-assets/build.Commit=${{ env.RELEASE_VERSION }}" ./cmd/tapcli
139+
go install -v -mod=vendor -ldflags "-X github.com/lightninglabs/taproot-assets/build.Commit=${{ env.RELEASE_VERSION }}" ./cmd/tapd
140+
go install -v -mod=vendor -ldflags "-X github.com/lightninglabs/taproot-assets/build.Commit=${{ env.RELEASE_VERSION }}" ./cmd/tapcli
141141
```
142142
143143
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.

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ VERSION_GO_FILE := "version.go"
1414

1515
COMMIT := $(shell git describe --tags --dirty --always)
1616

17-
GOBUILD := GOEXPERIMENT=loopvar GO111MODULE=on go build -v
18-
GOINSTALL := GOEXPERIMENT=loopvar GO111MODULE=on go install -v
19-
GOTEST := GOEXPERIMENT=loopvar GO111MODULE=on go test
20-
GOMOD := GO111MODULE=on go mod
17+
GOBUILD := go build -v
18+
GOINSTALL := go install -v
19+
GOTEST := go test
20+
GOMOD := go mod
2121

2222
GOLIST := go list -deps $(PKG)/... | grep '$(PKG)'
2323
GOLIST_COVER := $$(go list -deps $(PKG)/... | grep '$(PKG)')

docs/examples/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
GOBUILD := GOEXPERIMENT=loopvar GO111MODULE=on go build -v
1+
GOBUILD := go build -v
22

33
build:
44
cd ./basic-price-oracle && $(GOBUILD)

make/builder.Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ MAINTAINER Olaoluwa Osuntokun <laolu@lightning.engineering>
55
# Golang build related environment variables that are static and used for all
66
# architectures/OSes.
77
ENV GODEBUG netdns=cgo
8-
ENV GO111MODULE=auto
98
ENV CGO_ENABLED=0
109

1110
# Set up cache directories. Those will be mounted from the host system to speed

scripts/release.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,8 @@ required Go version ($goversion)."
179179
pushd "${dir}"
180180

181181
green " - Building: ${os} ${arch} ${arm} with build tags '${buildtags}'"
182-
env GOEXPERIMENT=loopvar CGO_ENABLED=0 GOOS="$os" GOARCH="$arch" GOARM=$arm GOAMD64="v1" go build -v -trimpath -ldflags="${ldflags}" -tags="${buildtags}" ${PKG}/cmd/tapd
183-
env GOEXPERIMENT=loopvar CGO_ENABLED=0 GOOS="$os" GOARCH="$arch" GOARM=$arm GOAMD64="v1" go build -v -trimpath -ldflags="${ldflags}" -tags="${buildtags}" ${PKG}/cmd/tapcli
182+
env CGO_ENABLED=0 GOOS="$os" GOARCH="$arch" GOARM=$arm GOAMD64="v1" go build -v -trimpath -ldflags="${ldflags}" -tags="${buildtags}" ${PKG}/cmd/tapd
183+
env CGO_ENABLED=0 GOOS="$os" GOARCH="$arch" GOARM=$arm GOAMD64="v1" go build -v -trimpath -ldflags="${ldflags}" -tags="${buildtags}" ${PKG}/cmd/tapcli
184184
popd
185185

186186
# Add the hashes for the individual binaries as well for easy verification

0 commit comments

Comments
 (0)