Skip to content

Commit d45675d

Browse files
authored
Merge pull request #5985 from Roasbeef/0-14-rc4
multi: bump version to v0.14.0-beta.rc4, include postgres+etcd in release build
2 parents c4e55bb + e94ddf7 commit d45675d

File tree

12 files changed

+15
-12
lines changed

12 files changed

+15
-12
lines changed

.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ env:
2424
# /dev.Dockerfile
2525
# /make/builder.Dockerfile
2626
# /.github/workflows/release.yml
27-
GO_VERSION: 1.17.1
27+
GO_VERSION: 1.17.3
2828

2929
jobs:
3030
########################

.github/workflows/release.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616
# /dev.Dockerfile
1717
# /make/builder.Dockerfile
1818
# /.github/workflows/main.yml
19-
GO_VERSION: 1.17.1
19+
GO_VERSION: 1.17.3
2020

2121
jobs:
2222
main:

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# /make/builder.Dockerfile
55
# /.github/workflows/main.yml
66
# /.github/workflows/release.yml
7-
FROM golang:1.17.1-alpine as builder
7+
FROM golang:1.17.3-alpine as builder
88

99
# Force Go to use the cgo based DNS resolver. This is required to ensure DNS
1010
# queries required to connect to linked containers succeed.

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ rpc-check: rpc
306306

307307
rpc-js-compile:
308308
@$(call print, "Compiling JSON/WASM stubs.")
309-
GOOS=js GOARCH=wasm $(GOBUILD) -tags="$(RELEASE_TAGS)" $(PKG)/lnrpc/...
309+
GOOS=js GOARCH=wasm $(GOBUILD) -tags="$(WASM_RELEASE_TAGS)" $(PKG)/lnrpc/...
310310

311311
sample-conf-check:
312312
@$(call print, "Making sure every flag has an example in the sample-lnd.conf file")

build/version.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ const (
4848

4949
// AppPreRelease MUST only contain characters from semanticAlphabet
5050
// per the semantic versioning spec.
51-
AppPreRelease = "beta.rc3"
51+
AppPreRelease = "beta.rc4"
5252
)
5353

5454
func init() {

dev.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# /make/builder.Dockerfile
55
# /.github/workflows/main.yml
66
# /.github/workflows/release.yml
7-
FROM golang:1.17.1-alpine as builder
7+
FROM golang:1.17.3-alpine as builder
88

99
LABEL maintainer="Olaoluwa Osuntokun <[email protected]>"
1010

docker/btcd/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.17.1-alpine as builder
1+
FROM golang:1.17.3-alpine as builder
22

33
LABEL maintainer="Olaoluwa Osuntokun <[email protected]>"
44

docker/ltcd/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.17.1-alpine as builder
1+
FROM golang:1.17.3-alpine as builder
22

33
LABEL maintainer="Olaoluwa Osuntokun <[email protected]>"
44

docs/release-notes/release-notes-0.14.0.md

+2
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,8 @@ messages directly. There is no routing/path finding involved.
281281

282282
## Build System
283283

284+
* [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).
285+
284286
* [A new pre-submit check has been
285287
added](https://github.com/lightningnetwork/lnd/pull/5520) to ensure that all
286288
PRs ([aside from merge

lnrpc/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.17.1-buster
1+
FROM golang:1.17.3-buster
22

33
RUN apt-get update && apt-get install -y \
44
git \

make/builder.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# /dev.Dockerfile
55
# /.github/workflows/main.yml
66
# /.github/workflows/release.yml
7-
FROM golang:1.17.1-buster
7+
FROM golang:1.17.3-buster
88

99
MAINTAINER Olaoluwa Osuntokun <[email protected]>
1010

make/release_flags.mk

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ dragonfly-amd64 \
1717
freebsd-386 \
1818
freebsd-amd64 \
1919
freebsd-arm \
20-
illumos-amd64 \
2120
linux-386 \
2221
linux-amd64 \
2322
linux-armv6 \
@@ -38,7 +37,9 @@ windows-386 \
3837
windows-amd64 \
3938
windows-arm
4039

41-
RELEASE_TAGS = autopilotrpc signrpc walletrpc chainrpc invoicesrpc watchtowerrpc monitoring
40+
RELEASE_TAGS = autopilotrpc signrpc walletrpc chainrpc invoicesrpc watchtowerrpc monitoring kvdb_postgres kvdb_etcd
41+
42+
WASM_RELEASE_TAGS = autopilotrpc signrpc walletrpc chainrpc invoicesrpc watchtowerrpc monitoring
4243

4344
# One can either specify a git tag as the version suffix or one is generated
4445
# from the current date.

0 commit comments

Comments
 (0)