Skip to content

Commit a6a3ab6

Browse files
committed
release+make: also build tapcli
1 parent ff26c64 commit a6a3ab6

File tree

4 files changed

+14
-1
lines changed

4 files changed

+14
-1
lines changed

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ COPY --from=golangbuilder /go/bin/lncli /bin/
6868
COPY --from=golangbuilder /go/bin/frcli /bin/
6969
COPY --from=golangbuilder /go/bin/loop /bin/
7070
COPY --from=golangbuilder /go/bin/pool /bin/
71+
COPY --from=golangbuilder /go/bin/tapcli /bin/
7172

7273
# Add bash.
7374
RUN apk add --no-cache \

Makefile

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ ESCPKG := github.com\/lightninglabs\/lightning-terminal
33
LND_PKG := github.com/lightningnetwork/lnd
44
LOOP_PKG := github.com/lightninglabs/loop
55
POOL_PKG := github.com/lightninglabs/pool
6+
TAP_PKG := github.com/lightninglabs/taproot-assets
67
BTCD_PKG := github.com/btcsuite/btcd
78

89
GOACC_PKG := github.com/ory/go-acc
@@ -29,6 +30,12 @@ POOL_COMMIT := $(shell cat go.mod | \
2930
awk -F " " '{ print $$2 }' | \
3031
awk -F "/" '{ print $$1 }')
3132

33+
TAP_COMMIT := $(shell cat go.mod | \
34+
grep $(TAP_PKG) | \
35+
head -n1 | \
36+
awk -F " " '{ print $$2 }' | \
37+
awk -F "/" '{ print $$1 }')
38+
3239
GOBUILD := go build -v
3340
GOINSTALL := go install -v
3441
GOTEST := go test -v
@@ -61,7 +68,8 @@ make_ldflags = $(2) -X $(LND_PKG)/build.Commit=lightning-terminal-$(COMMIT) \
6168
-X $(PKG).appFilesPrefix=$(PUBLIC_URL) \
6269
-X $(PKG).Commit=$(COMMIT) \
6370
-X $(LOOP_PKG).Commit=$(LOOP_COMMIT) \
64-
-X $(POOL_PKG).Commit=$(POOL_COMMIT)
71+
-X $(POOL_PKG).Commit=$(POOL_COMMIT) \
72+
-X $(TAP_PKG).Commit=$(TAP_COMMIT)
6573

6674
LDFLAGS := $(call make_ldflags, $(LND_RELEASE_TAGS))
6775

@@ -129,6 +137,7 @@ go-install-cli:
129137
$(GOINSTALL) -trimpath -ldflags "$(LDFLAGS)" github.com/lightninglabs/loop/cmd/loop
130138
$(GOINSTALL) -trimpath github.com/lightninglabs/faraday/cmd/frcli
131139
$(GOINSTALL) -trimpath -ldflags "$(LDFLAGS)" github.com/lightninglabs/pool/cmd/pool
140+
$(GOINSTALL) -trimpath -ldflags "$(LDFLAGS)" github.com/lightninglabs/taproot-assets/cmd/tapcli
132141

133142
app-build: yarn-install
134143
@$(call print, "Building production app.")

dev.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ COPY --from=golangbuilder /go/bin/lncli /bin/
4646
COPY --from=golangbuilder /go/bin/frcli /bin/
4747
COPY --from=golangbuilder /go/bin/loop /bin/
4848
COPY --from=golangbuilder /go/bin/pool /bin/
49+
COPY --from=golangbuilder /go/bin/tapcli /bin/
4950

5051
# Add bash.
5152
RUN apk add --no-cache \

release.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ LND_PKG="github.com/lightningnetwork/lnd"
1414
FARADAY_PKG="github.com/lightninglabs/faraday"
1515
LOOP_PKG="github.com/lightninglabs/loop"
1616
POOL_PKG="github.com/lightninglabs/pool"
17+
TAP_PKG="github.com/lightninglabs/taproot-assets"
1718
PACKAGE=lightning-terminal
1819

1920
# green prints one line of green text (if the terminal supports it).
@@ -75,6 +76,7 @@ function build_release() {
7576
env CGO_ENABLED=0 GOOS=$os GOARCH=$arch GOARM=$arm go build -v -trimpath -ldflags="${ldflags}" -tags="${buildtags}" ${FARADAY_PKG}/cmd/frcli
7677
env CGO_ENABLED=0 GOOS=$os GOARCH=$arch GOARM=$arm go build -v -trimpath -ldflags="${ldflags}" -tags="${buildtags}" ${LOOP_PKG}/cmd/loop
7778
env CGO_ENABLED=0 GOOS=$os GOARCH=$arch GOARM=$arm go build -v -trimpath -ldflags="${ldflags}" -tags="${buildtags}" ${POOL_PKG}/cmd/pool
79+
env CGO_ENABLED=0 GOOS=$os GOARCH=$arch GOARM=$arm go build -v -trimpath -ldflags="${ldflags}" -tags="${buildtags}" ${TAP_PKG}/cmd/tapcli
7880
popd
7981

8082
if [[ $os == "windows" ]]; then

0 commit comments

Comments
 (0)