From 68309d30c26b2a5f1a367177f7a278978334ab8a Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Mon, 15 Nov 2021 13:54:12 -0800 Subject: [PATCH 1/6] make+build: build with postgres+etcd for the release build --- make/release_flags.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/release_flags.mk b/make/release_flags.mk index 8eb4adf5..0be1f3ba 100644 --- a/make/release_flags.mk +++ b/make/release_flags.mk @@ -38,7 +38,7 @@ windows-386 \ windows-amd64 \ windows-arm -RELEASE_TAGS = autopilotrpc signrpc walletrpc chainrpc invoicesrpc watchtowerrpc monitoring +RELEASE_TAGS = autopilotrpc signrpc walletrpc chainrpc invoicesrpc watchtowerrpc monitoring kvdb_postgres kvdb_etcd # One can either specify a git tag as the version suffix or one is generated # from the current date. From 203bae9aff2a2622b0d87c49ded718ccc37b95dc Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Mon, 15 Nov 2021 13:59:08 -0800 Subject: [PATCH 2/6] build: bump version to v0.14.0-beta.rc4 --- build/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/version.go b/build/version.go index 1c821fe0..51d2edc3 100644 --- a/build/version.go +++ b/build/version.go @@ -48,7 +48,7 @@ const ( // AppPreRelease MUST only contain characters from semanticAlphabet // per the semantic versioning spec. - AppPreRelease = "beta.rc3" + AppPreRelease = "beta.rc4" ) func init() { From 4c6bc80d83e297b8ebf579d4d263ddc42be6fef4 Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Mon, 15 Nov 2021 16:01:06 -0800 Subject: [PATCH 3/6] build: remove illumos as a release build target --- make/release_flags.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/make/release_flags.mk b/make/release_flags.mk index 0be1f3ba..ae23ac72 100644 --- a/make/release_flags.mk +++ b/make/release_flags.mk @@ -17,7 +17,6 @@ dragonfly-amd64 \ freebsd-386 \ freebsd-amd64 \ freebsd-arm \ -illumos-amd64 \ linux-386 \ linux-amd64 \ linux-armv6 \ From f7dd70b5cbf423f9c5e3d7714d426971fac6ffea Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Mon, 15 Nov 2021 16:03:57 -0800 Subject: [PATCH 4/6] docs/release-notes: add release notes for illumos drop --- docs/release-notes/release-notes-0.14.0.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/release-notes/release-notes-0.14.0.md b/docs/release-notes/release-notes-0.14.0.md index 7774cb1d..abe3671a 100644 --- a/docs/release-notes/release-notes-0.14.0.md +++ b/docs/release-notes/release-notes-0.14.0.md @@ -281,6 +281,8 @@ messages directly. There is no routing/path finding involved. ## Build System +* [The illumos operating system has been dropped from the set of release binaries. We now also build with postgres and etcd in the main release binaries](https://github.com/lightningnetwork/lnd/pull/5985). + * [A new pre-submit check has been added](https://github.com/lightningnetwork/lnd/pull/5520) to ensure that all PRs ([aside from merge From 1bff146c43b386f787046ba78f32209bf73ff607 Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Mon, 15 Nov 2021 17:13:38 -0800 Subject: [PATCH 5/6] build: add new WASM specific release/build tags We need to drop things like postgres+etcd, as they don't understand the WASM/JS build target. --- Makefile | 2 +- make/release_flags.mk | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5374e772..9f9aae7b 100644 --- a/Makefile +++ b/Makefile @@ -306,7 +306,7 @@ rpc-check: rpc rpc-js-compile: @$(call print, "Compiling JSON/WASM stubs.") - GOOS=js GOARCH=wasm $(GOBUILD) -tags="$(RELEASE_TAGS)" $(PKG)/lnrpc/... + GOOS=js GOARCH=wasm $(GOBUILD) -tags="$(WASM_RELEASE_TAGS)" $(PKG)/lnrpc/... sample-conf-check: @$(call print, "Making sure every flag has an example in the sample-lnd.conf file") diff --git a/make/release_flags.mk b/make/release_flags.mk index ae23ac72..2c1db19a 100644 --- a/make/release_flags.mk +++ b/make/release_flags.mk @@ -39,6 +39,8 @@ windows-arm RELEASE_TAGS = autopilotrpc signrpc walletrpc chainrpc invoicesrpc watchtowerrpc monitoring kvdb_postgres kvdb_etcd +WASM_RELEASE_TAGS = autopilotrpc signrpc walletrpc chainrpc invoicesrpc watchtowerrpc monitoring + # One can either specify a git tag as the version suffix or one is generated # from the current date. ifneq ($(tag),) From e94ddf7b17fcb1d586dd5cb980930480e1885c8b Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Mon, 15 Nov 2021 17:28:49 -0800 Subject: [PATCH 6/6] build: bump release+build version to Go 1.17.3 --- .github/workflows/main.yml | 2 +- .github/workflows/release.yaml | 2 +- Dockerfile | 2 +- dev.Dockerfile | 2 +- docker/btcd/Dockerfile | 2 +- docker/ltcd/Dockerfile | 2 +- lnrpc/Dockerfile | 2 +- make/builder.Dockerfile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3c38f64e..d9e7a593 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,7 +24,7 @@ env: # /dev.Dockerfile # /make/builder.Dockerfile # /.github/workflows/release.yml - GO_VERSION: 1.17.1 + GO_VERSION: 1.17.3 jobs: ######################## diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 40bc6525..482e74f6 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -16,7 +16,7 @@ env: # /dev.Dockerfile # /make/builder.Dockerfile # /.github/workflows/main.yml - GO_VERSION: 1.17.1 + GO_VERSION: 1.17.3 jobs: main: diff --git a/Dockerfile b/Dockerfile index 38d47c18..92782a85 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ # /make/builder.Dockerfile # /.github/workflows/main.yml # /.github/workflows/release.yml -FROM golang:1.17.1-alpine as builder +FROM golang:1.17.3-alpine as builder # Force Go to use the cgo based DNS resolver. This is required to ensure DNS # queries required to connect to linked containers succeed. diff --git a/dev.Dockerfile b/dev.Dockerfile index 77dd0354..2282c3c7 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -4,7 +4,7 @@ # /make/builder.Dockerfile # /.github/workflows/main.yml # /.github/workflows/release.yml -FROM golang:1.17.1-alpine as builder +FROM golang:1.17.3-alpine as builder LABEL maintainer="Olaoluwa Osuntokun " diff --git a/docker/btcd/Dockerfile b/docker/btcd/Dockerfile index a87d081a..7bdb63a8 100644 --- a/docker/btcd/Dockerfile +++ b/docker/btcd/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.17.1-alpine as builder +FROM golang:1.17.3-alpine as builder LABEL maintainer="Olaoluwa Osuntokun " diff --git a/docker/ltcd/Dockerfile b/docker/ltcd/Dockerfile index 944fb87f..6f2ee50b 100644 --- a/docker/ltcd/Dockerfile +++ b/docker/ltcd/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.17.1-alpine as builder +FROM golang:1.17.3-alpine as builder LABEL maintainer="Olaoluwa Osuntokun " diff --git a/lnrpc/Dockerfile b/lnrpc/Dockerfile index d9a02ac0..780f1121 100644 --- a/lnrpc/Dockerfile +++ b/lnrpc/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.17.1-buster +FROM golang:1.17.3-buster RUN apt-get update && apt-get install -y \ git \ diff --git a/make/builder.Dockerfile b/make/builder.Dockerfile index 79f40325..a164337d 100644 --- a/make/builder.Dockerfile +++ b/make/builder.Dockerfile @@ -4,7 +4,7 @@ # /dev.Dockerfile # /.github/workflows/main.yml # /.github/workflows/release.yml -FROM golang:1.17.1-buster +FROM golang:1.17.3-buster MAINTAINER Olaoluwa Osuntokun