Skip to content

Commit ebb5e94

Browse files
committed
multi: remove GO111MODULE, add icase flag to itest
1 parent 76b162d commit ebb5e94

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ COPY --from=nodejsbuilder /go/src/github.com/lightninglabs/lightning-terminal /g
4545
# queries required to connect to linked containers succeed.
4646
ENV GODEBUG netdns=cgo
4747

48-
# Explicitly turn on the use of modules (until this becomes the default).
49-
ENV GO111MODULE on
50-
5148
# Install dependencies and install/build lightning-terminal.
5249
RUN apk add --no-cache --update alpine-sdk \
5350
make \

Makefile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ POOL_COMMIT := $(shell cat go.mod | \
3333
LINT_COMMIT := v1.18.0
3434
GOACC_COMMIT := ddc355013f90fea78d83d3a6c71f1d37ac07ecd5
3535

36-
DEPGET := cd /tmp && GO111MODULE=on go get -v
37-
GOBUILD := GO111MODULE=on go build -v
38-
GOINSTALL := GO111MODULE=on go install -v
39-
GOTEST := GO111MODULE=on go test -v
40-
GOMOD := GO111MODULE=on go mod
36+
DEPGET := cd /tmp && go get -v
37+
GOBUILD := go build -v
38+
GOINSTALL := go install -v
39+
GOTEST := go test -v
40+
GOMOD := go mod
4141

4242
GOFILES_NOVENDOR = $(shell find . -type f -name '*.go' -not -path "./vendor/*")
4343
GOLIST := go list -deps $(PKG)/... | grep '$(PKG)'| grep -v '/vendor/'
@@ -54,6 +54,7 @@ UNIT := $(GOLIST) | $(XARGS) env $(GOTEST)
5454
UNIT_RACE := $(UNIT) -race
5555

5656
include make/release_flags.mk
57+
include make/testing_flags.mk
5758

5859
# We only return the part inside the double quote here to avoid escape issues
5960
# when calling the external release script. The second parameter can be used to

dev.Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ COPY --from=nodejsbuilder /go/src/github.com/lightninglabs/lightning-terminal /g
2323
# queries required to connect to linked containers succeed.
2424
ENV GODEBUG netdns=cgo
2525

26-
# Explicitly turn on the use of modules (until this becomes the default).
27-
ENV GO111MODULE on
28-
2926
# Install dependencies and install/build lightning-terminal.
3027
RUN apk add --no-cache --update alpine-sdk \
3128
make \

litrpc/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ ARG GRPC_GATEWAY_VERSION
1414
ENV PROTOC_GEN_GO_GRPC_VERSION="v1.1.0"
1515

1616
RUN cd /tmp \
17-
&& export GO111MODULE=on \
1817
&& go get google.golang.org/protobuf/cmd/protoc-gen-go@${PROTOBUF_VERSION} \
1918
&& go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@${PROTOC_GEN_GO_GRPC_VERSION} \
2019
&& go get github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@${GRPC_GATEWAY_VERSION} \

make/testing_flags.mk

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
ITEST_FLAGS =
2+
3+
# Define the integration test.run filter if the icase argument was provided.
4+
ifneq ($(icase),)
5+
ITEST_FLAGS += -test.run="TestLightningTerminal/.*/$(icase)"
6+
endif

0 commit comments

Comments
 (0)