From af0fc09f62c69bf61617d51caaec1ce22eae49e3 Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Tue, 16 Feb 2021 16:18:35 -0800 Subject: [PATCH 1/4] multi: update build systems and CI/CD to go 1.16 --- .github/workflows/main.yml | 2 +- .github/workflows/release.yaml | 2 +- .travis.yml | 2 +- Dockerfile | 2 +- dev.Dockerfile | 2 +- docker/btcd/Dockerfile | 2 +- docker/ltcd/Dockerfile | 2 +- lnrpc/Dockerfile | 2 +- make/builder.Dockerfile | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9185e0a3..480012e7 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.15.7 + GO_VERSION: 1.16.3 jobs: ######################## diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 0f40d520..9a4ef98b 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.15.7 + GO_VERSION: 1.16.3 jobs: main: diff --git a/.travis.yml b/.travis.yml index 9a6987aa..3d8bd27e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ go: # /make/builder.Dockerfile # /.github/workflows/main.yml # /.github/workflows/release.yml - - "1.15.7" + - 1.16.3 env: global: diff --git a/Dockerfile b/Dockerfile index 29d332d8..c6310f5c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ # /make/builder.Dockerfile # /.github/workflows/main.yml # /.github/workflows/release.yml -FROM golang:1.15.7-alpine as builder +FROM golang:1.16.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 046bf3e4..bbe20146 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.15.7-alpine as builder +FROM golang:1.16.3-alpine as builder LABEL maintainer="Olaoluwa Osuntokun " diff --git a/docker/btcd/Dockerfile b/docker/btcd/Dockerfile index 4013994b..73957d0d 100644 --- a/docker/btcd/Dockerfile +++ b/docker/btcd/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15.7-alpine as builder +FROM golang:1.16.3-alpine as builder LABEL maintainer="Olaoluwa Osuntokun " diff --git a/docker/ltcd/Dockerfile b/docker/ltcd/Dockerfile index 8d93d433..c49c066e 100644 --- a/docker/ltcd/Dockerfile +++ b/docker/ltcd/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15.7-alpine as builder +FROM golang:1.16.3-alpine as builder LABEL maintainer="Olaoluwa Osuntokun " diff --git a/lnrpc/Dockerfile b/lnrpc/Dockerfile index abe38567..350580ad 100644 --- a/lnrpc/Dockerfile +++ b/lnrpc/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15.7-buster +FROM golang:1.16.3-buster RUN apt-get update && apt-get install -y \ git \ diff --git a/make/builder.Dockerfile b/make/builder.Dockerfile index 1e35f368..1273150b 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.15.7-buster +FROM golang:1.16.3-buster MAINTAINER Olaoluwa Osuntokun From 95650c7d63e59b9a2dd5dabd64f411d27c03ecae Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Tue, 16 Feb 2021 16:19:52 -0800 Subject: [PATCH 2/4] build: add darwin-arm64 (M1 Apple Silicon) as a release target --- make/release_flags.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/make/release_flags.mk b/make/release_flags.mk index 8a00f089..5b6f2af0 100644 --- a/make/release_flags.mk +++ b/make/release_flags.mk @@ -12,6 +12,7 @@ DOCKER_RELEASE_HELPER = docker run \ lnd-release-helper BUILD_SYSTEM = darwin-amd64 \ +darwin-arm64 \ dragonfly-amd64 \ freebsd-386 \ freebsd-amd64 \ From a1bfbdc7d23c56d68caf877fb97755e68a8775e8 Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Tue, 16 Feb 2021 16:23:45 -0800 Subject: [PATCH 3/4] docs/INSTALL.md: update install docs w/ new min Go version --- docs/INSTALL.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/INSTALL.md b/docs/INSTALL.md index d8b5edb4..6c721ef7 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -93,46 +93,46 @@ version if there are database migrations present. * **Go:** `lnd` is written in Go. To install, run one of the following commands: - **Note**: The minimum version of Go supported is Go 1.13. We recommend that + **Note**: The minimum version of Go supported is Go 1.15. We recommend that users use the latest version of Go, which at the time of writing is - [`1.15`](https://blog.golang.org/go1.15). + [`1.16`](https://blog.golang.org/go1.16). On Linux: (x86-64) ``` - wget https://dl.google.com/go/go1.13.linux-amd64.tar.gz - sha256sum go1.13.linux-amd64.tar.gz | awk -F " " '{ print $1 }' + wget https://dl.google.com/go/go1.16.linux-amd64.tar.gz + sha256sum go1.16.linux-amd64.tar.gz | awk -F " " '{ print $1 }' ``` The final output of the command above should be - `68a2297eb099d1a76097905a2ce334e3155004ec08cdea85f24527be3c48e856`. If it + `013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2`. If it isn't, then the target REPO HAS BEEN MODIFIED, and you shouldn't install this version of Go. If it matches, then proceed to install Go: ``` - tar -C /usr/local -xzf go1.13.linux-amd64.tar.gz + tar -C /usr/local -xzf go1.16.linux-amd64.tar.gz export PATH=$PATH:/usr/local/go/bin ``` (ARMv6) ``` - wget https://dl.google.com/go/go1.13.linux-armv6l.tar.gz - sha256sum go1.13.linux-armv6l.tar.gz | awk -F " " '{ print $1 }' + wget https://dl.google.com/go/go1.16.linux-armv6l.tar.gz + sha256sum go1.16.linux-armv6l.tar.gz | awk -F " " '{ print $1 }' ``` The final output of the command above should be - `931906d67cae1222f501e7be26e0ee73ba89420be0c4591925901cb9a4e156f0`. If it + `d1d9404b1dbd77afa2bdc70934e10fbfcf7d785c372efc29462bb7d83d0a32fd`. If it isn't, then the target REPO HAS BEEN MODIFIED, and you shouldn't install this version of Go. If it matches, then proceed to install Go: ``` - tar -C /usr/local -xzf go1.13.linux-armv6l.tar.gz + tar -C /usr/local -xzf go1.16.linux-armv6l.tar.gz export PATH=$PATH:/usr/local/go/bin ``` On Mac OS X: ``` - brew install go@1.13 + brew install go@1.16 ``` On FreeBSD: From 3d0c477704b68f427c75d42269bfaccde9989cdc Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Fri, 5 Mar 2021 14:55:04 -0800 Subject: [PATCH 4/4] build: retract v0.0.2 A stray version of lnd was pushed out waaaay back in 2016 that can trip up `pkg.go.dev` and things like `go get`. Using the new Go 1.16 feature, we can now "retract" this version, which marks it as being unavailable. --- go.mod | 2 ++ 1 file changed, 2 insertions(+) diff --git a/go.mod b/go.mod index 13dee18a..e5537c1d 100644 --- a/go.mod +++ b/go.mod @@ -90,3 +90,5 @@ replace github.com/lightningnetwork/lnd/clock => ./clock replace git.schwanenlied.me/yawning/bsaes.git => github.com/Yawning/bsaes v0.0.0-20180720073208-c0276d75487e go 1.13 + +retract v0.0.2