mirror of
https://github.com/lightninglabs/lightning-terminal.git
synced 2026-08-13 12:33:36 +02:00
multi: remove GO111MODULE, add icase flag to itest
This commit is contained in:
parent
76b162d3f7
commit
ebb5e94381
5 changed files with 12 additions and 12 deletions
|
|
@ -45,9 +45,6 @@ COPY --from=nodejsbuilder /go/src/github.com/lightninglabs/lightning-terminal /g
|
|||
# queries required to connect to linked containers succeed.
|
||||
ENV GODEBUG netdns=cgo
|
||||
|
||||
# Explicitly turn on the use of modules (until this becomes the default).
|
||||
ENV GO111MODULE on
|
||||
|
||||
# Install dependencies and install/build lightning-terminal.
|
||||
RUN apk add --no-cache --update alpine-sdk \
|
||||
make \
|
||||
|
|
|
|||
11
Makefile
11
Makefile
|
|
@ -33,11 +33,11 @@ POOL_COMMIT := $(shell cat go.mod | \
|
|||
LINT_COMMIT := v1.18.0
|
||||
GOACC_COMMIT := ddc355013f90fea78d83d3a6c71f1d37ac07ecd5
|
||||
|
||||
DEPGET := cd /tmp && GO111MODULE=on go get -v
|
||||
GOBUILD := GO111MODULE=on go build -v
|
||||
GOINSTALL := GO111MODULE=on go install -v
|
||||
GOTEST := GO111MODULE=on go test -v
|
||||
GOMOD := GO111MODULE=on go mod
|
||||
DEPGET := cd /tmp && go get -v
|
||||
GOBUILD := go build -v
|
||||
GOINSTALL := go install -v
|
||||
GOTEST := go test -v
|
||||
GOMOD := go mod
|
||||
|
||||
GOFILES_NOVENDOR = $(shell find . -type f -name '*.go' -not -path "./vendor/*")
|
||||
GOLIST := go list -deps $(PKG)/... | grep '$(PKG)'| grep -v '/vendor/'
|
||||
|
|
@ -54,6 +54,7 @@ UNIT := $(GOLIST) | $(XARGS) env $(GOTEST)
|
|||
UNIT_RACE := $(UNIT) -race
|
||||
|
||||
include make/release_flags.mk
|
||||
include make/testing_flags.mk
|
||||
|
||||
# We only return the part inside the double quote here to avoid escape issues
|
||||
# when calling the external release script. The second parameter can be used to
|
||||
|
|
|
|||
|
|
@ -23,9 +23,6 @@ COPY --from=nodejsbuilder /go/src/github.com/lightninglabs/lightning-terminal /g
|
|||
# queries required to connect to linked containers succeed.
|
||||
ENV GODEBUG netdns=cgo
|
||||
|
||||
# Explicitly turn on the use of modules (until this becomes the default).
|
||||
ENV GO111MODULE on
|
||||
|
||||
# Install dependencies and install/build lightning-terminal.
|
||||
RUN apk add --no-cache --update alpine-sdk \
|
||||
make \
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ ARG GRPC_GATEWAY_VERSION
|
|||
ENV PROTOC_GEN_GO_GRPC_VERSION="v1.1.0"
|
||||
|
||||
RUN cd /tmp \
|
||||
&& export GO111MODULE=on \
|
||||
&& go get google.golang.org/protobuf/cmd/protoc-gen-go@${PROTOBUF_VERSION} \
|
||||
&& go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@${PROTOC_GEN_GO_GRPC_VERSION} \
|
||||
&& go get github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@${GRPC_GATEWAY_VERSION} \
|
||||
|
|
|
|||
6
make/testing_flags.mk
Normal file
6
make/testing_flags.mk
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
ITEST_FLAGS =
|
||||
|
||||
# Define the integration test.run filter if the icase argument was provided.
|
||||
ifneq ($(icase),)
|
||||
ITEST_FLAGS += -test.run="TestLightningTerminal/.*/$(icase)"
|
||||
endif
|
||||
Loading…
Add table
Add a link
Reference in a new issue