From 64b3c97b9f07adcda8d89d7d1c029e4b113b461c Mon Sep 17 00:00:00 2001 From: Oliver Gugger Date: Mon, 27 Jun 2022 16:40:06 +0200 Subject: [PATCH 1/2] .gitignore: add release build directory to ignore list Fixes #6672. A new metadata tag called build.vcs.modified was added in Go 1.18.x that indicates whether there were any untracked files present during the build or not. Because the `make release` command creates a directory in which the output packages are created, and because that directory was not added to git and also not ignored by it, the build.vcs.modified flag was different to the docker build which resulted in a different digest of the resulting binary. --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index e5e5bbfeb..157010fd9 100644 --- a/.gitignore +++ b/.gitignore @@ -77,3 +77,7 @@ coverage.txt # Visual Studio cache/options directory .vs/ + +# Release build directory (to avoid build.vcs.modified Golang build tag to be +# set to true by having untracked files in the working directory). +/lnd-*/ From b60c640cbea40f6fdc6205fe5c0a457ff16e732a Mon Sep 17 00:00:00 2001 From: Oliver Gugger Date: Mon, 27 Jun 2022 16:44:16 +0200 Subject: [PATCH 2/2] doc: add release notes --- docs/release-notes/release-notes-0.15.1.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/release-notes/release-notes-0.15.1.md b/docs/release-notes/release-notes-0.15.1.md index 3e7dfc179..f98d0bfb6 100644 --- a/docs/release-notes/release-notes-0.15.1.md +++ b/docs/release-notes/release-notes-0.15.1.md @@ -1,5 +1,11 @@ # Release Notes +## Build system + +* [Add the release build directory to the `.gitignore` file to avoid the release + binary digest to be different whether that folder exists or + not](https://github.com/lightningnetwork/lnd/pull/6676) + ## `lncli` * [Add `payment_addr` flag to `buildroute`](https://github.com/lightningnetwork/lnd/pull/6576) @@ -19,4 +25,5 @@ * Elle Mouton * ErikEk +* Oliver Gugger * Priyansh Rastogi