diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3c38f64e1..d9e7a5934 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 40bc65253..482e74f6c 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 38d47c189..92782a85f 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/Makefile b/Makefile index 5374e7721..9f9aae7ba 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/build/version.go b/build/version.go index 1c821fe0a..51d2edc3d 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() { diff --git a/dev.Dockerfile b/dev.Dockerfile index 77dd03541..2282c3c7f 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 a87d081a8..7bdb63a8e 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 944fb87f6..6f2ee50b6 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/docs/release-notes/release-notes-0.14.0.md b/docs/release-notes/release-notes-0.14.0.md index 7774cb1d9..abe3671a2 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 diff --git a/lnrpc/Dockerfile b/lnrpc/Dockerfile index d9a02ac05..780f1121a 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 79f40325f..a164337d6 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 diff --git a/make/release_flags.mk b/make/release_flags.mk index 8eb4adf5f..2c1db19a3 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 \ @@ -38,7 +37,9 @@ 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 + +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.