diff --git a/Makefile b/Makefile index 014c28856..69ca4812e 100644 --- a/Makefile +++ b/Makefile @@ -27,9 +27,9 @@ ANDROID_BUILD := $(ANDROID_BUILD_DIR)/Lndmobile.aar COMMIT := $(shell git describe --tags --dirty) COMMIT_HASH := $(shell git rev-parse HEAD) -GOBUILD := GO111MODULE=on go build -v -GOINSTALL := GO111MODULE=on go install -v -GOTEST := GO111MODULE=on go test +GOBUILD := go build -v +GOINSTALL := go install -v +GOTEST := go test GOVERSION := $(shell go version | awk '{print $$3}') 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") @@ -290,7 +290,7 @@ mobile-rpc: vendor: @$(call print, "Re-creating vendor directory.") - rm -r vendor/; GO111MODULE=on go mod vendor + rm -r vendor/; go mod vendor ios: vendor mobile-rpc @$(call print, "Building iOS framework ($(IOS_BUILD)).") diff --git a/docker/btcd/Dockerfile b/docker/btcd/Dockerfile index 7bdb63a8e..3cbc91f14 100644 --- a/docker/btcd/Dockerfile +++ b/docker/btcd/Dockerfile @@ -13,7 +13,7 @@ ARG BTCD_VERSION=v0.20.1-beta # Grab and install the latest version of of btcd and all related dependencies. RUN git clone https://github.com/btcsuite/btcd.git . \ && git checkout $BTCD_VERSION \ - && GO111MODULE=on go install -v . ./cmd/... + && go install -v . ./cmd/... # Start a new image FROM alpine as final diff --git a/docker/ltcd/Dockerfile b/docker/ltcd/Dockerfile index 6f2ee50b6..6b78cff44 100644 --- a/docker/ltcd/Dockerfile +++ b/docker/ltcd/Dockerfile @@ -7,8 +7,8 @@ LABEL maintainer="Olaoluwa Osuntokun " WORKDIR $GOPATH/src/github.com/ltcsuite/ltcd RUN apk add --no-cache --update alpine-sdk git RUN git clone https://github.com/ltcsuite/ltcd ./ -RUN GO111MODULE=on go install -v . ./cmd/... -RUN GO111MODULE=on go install . ./cmd/ltcctl ./cmd/gencerts +RUN go install -v . ./cmd/... +RUN go install . ./cmd/ltcctl ./cmd/gencerts # Start a new image FROM alpine as final diff --git a/docs/INSTALL.md b/docs/INSTALL.md index 4c732ac9d..47ed8f445 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -208,7 +208,7 @@ On FreeBSD, use gmake instead of make. Alternatively, if one doesn't wish to use `make`, then the `go` commands can be used directly: ```shell -⛰ GO111MODULE=on go install -v ./... +⛰ go install -v ./... ``` **Updating** @@ -228,7 +228,7 @@ used directly: ```shell ⛰ cd $GOPATH/src/github.com/lightningnetwork/lnd ⛰ git pull -⛰ GO111MODULE=on go install -v ./... +⛰ go install -v ./... ``` **Tests** diff --git a/docs/release-notes/release-notes-0.14.2.md b/docs/release-notes/release-notes-0.14.2.md new file mode 100644 index 000000000..884cd3397 --- /dev/null +++ b/docs/release-notes/release-notes-0.14.2.md @@ -0,0 +1,11 @@ +# Release Notes + +## Build System + +* [Clean up Makefile by using go + install](https://github.com/lightningnetwork/lnd/pull/6035). + +# Contributors (Alphabetical Order) + +* Naveen Srinivasan +* Oliver Gugger diff --git a/lnrpc/Dockerfile b/lnrpc/Dockerfile index 780f1121a..1152740d1 100644 --- a/lnrpc/Dockerfile +++ b/lnrpc/Dockerfile @@ -19,7 +19,6 @@ ENV GOMODCACHE=/tmp/build/.modcache RUN cd /tmp \ && mkdir -p /tmp/build/.cache \ && mkdir -p /tmp/build/.modcache \ - && export GO111MODULE=on \ && go install google.golang.org/protobuf/cmd/protoc-gen-go@${PROTOBUF_VERSION} \ && go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@${PROTOC_GEN_GO_GRPC_VERSION} \ && go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@${GRPC_GATEWAY_VERSION} \