highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-06-01 18:50:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

multi: Remove GO111MODULE env variable in Makefile

Browse Source 
The `GO111MODULE` variable is not required from go 1.16
https://go.dev/blog/go116-module-changes
This commit is contained in:
naveen 2021-10-01 19:45:39 +00:00 committed by Oliver Gugger
parent 43158b6b59
commit b3ef3db0f2
No known key found for this signature in database
GPG Key ID: 8E4256593F177720
6 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -27,9 +27,9 @@ ANDROID_BUILD := $(ANDROID_BUILD_DIR)/Lndmobile.aar
COMMIT := $(shell git describe --tags --dirty) COMMIT := $(shell git describe --tags --dirty)
COMMIT_HASH := $(shell git rev-parse HEAD) COMMIT_HASH := $(shell git rev-parse HEAD)
GOBUILD := GO111MODULE=on go build -v GOBUILD := go build -v
GOINSTALL := GO111MODULE=on go install -v GOINSTALL := go install -v
GOTEST := GO111MODULE=on go test GOTEST := go test
GOVERSION := $(shell go version | awk '{print $$3}') 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") 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: vendor:
@$(call print, "Re-creating vendor directory.") @$(call print, "Re-creating vendor directory.")
rm -r vendor/; GO111MODULE=on go mod vendor rm -r vendor/; go mod vendor
ios: vendor mobile-rpc ios: vendor mobile-rpc
@$(call print, "Building iOS framework ($(IOS_BUILD)).") @$(call print, "Building iOS framework ($(IOS_BUILD)).")

2
docker/btcd/Dockerfile
View File

@ -13,7 +13,7 @@ ARG BTCD_VERSION=v0.20.1-beta
# Grab and install the latest version of of btcd and all related dependencies. # Grab and install the latest version of of btcd and all related dependencies.
RUN git clone https://github.com/btcsuite/btcd.git . \ RUN git clone https://github.com/btcsuite/btcd.git . \
&& git checkout $BTCD_VERSION \ && git checkout $BTCD_VERSION \
&& GO111MODULE=on go install -v . ./cmd/... && go install -v . ./cmd/...
# Start a new image # Start a new image
FROM alpine as final FROM alpine as final

4
docker/ltcd/Dockerfile
View File

@ -7,8 +7,8 @@ LABEL maintainer="Olaoluwa Osuntokun <laolu@lightning.engineering>"
WORKDIR $GOPATH/src/github.com/ltcsuite/ltcd WORKDIR $GOPATH/src/github.com/ltcsuite/ltcd
RUN apk add --no-cache --update alpine-sdk git RUN apk add --no-cache --update alpine-sdk git
RUN git clone https://github.com/ltcsuite/ltcd ./ RUN git clone https://github.com/ltcsuite/ltcd ./
RUN GO111MODULE=on go install -v . ./cmd/... RUN go install -v . ./cmd/...
RUN GO111MODULE=on go install . ./cmd/ltcctl ./cmd/gencerts RUN go install . ./cmd/ltcctl ./cmd/gencerts
# Start a new image # Start a new image
FROM alpine as final FROM alpine as final

4
docs/INSTALL.md
View File

@ -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 Alternatively, if one doesn't wish to use `make`, then the `go` commands can be
used directly: used directly:
```shell ```shell
⛰ GO111MODULE=on go install -v ./... ⛰ go install -v ./...
``` ```
**Updating** **Updating**
@ -228,7 +228,7 @@ used directly:
```shell ```shell
⛰ cd $GOPATH/src/github.com/lightningnetwork/lnd ⛰ cd $GOPATH/src/github.com/lightningnetwork/lnd
⛰ git pull ⛰ git pull
⛰ GO111MODULE=on go install -v ./... ⛰ go install -v ./...
``` ```
**Tests** **Tests**

11
docs/release-notes/release-notes-0.14.2.md Normal file
View File

@ -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

1
lnrpc/Dockerfile
View File

@ -19,7 +19,6 @@ ENV GOMODCACHE=/tmp/build/.modcache
RUN cd /tmp \ RUN cd /tmp \
&& mkdir -p /tmp/build/.cache \ && mkdir -p /tmp/build/.cache \
&& mkdir -p /tmp/build/.modcache \ && 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/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 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} \ && go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@${GRPC_GATEWAY_VERSION} \