From 8fad69be3823531090090847c94fc8e3980cc83a Mon Sep 17 00:00:00 2001 From: Thomas Parrott Date: Wed, 20 Nov 2024 13:00:43 +0000 Subject: [PATCH 1/2] snapcraft: Drop deprecated go get -d flag Signed-off-by: Thomas Parrott --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index e7b65930..4200a84d 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1409,7 +1409,7 @@ parts: ln -s "$(pwd)" "${GOPATH}/src/github.com/canonical/lxd" # Download the dependencies - go get -d -v ./... + go get -v ./... override-build: | set -ex From 8c71034237273a0869d94b61562f5ab8e631f2ba Mon Sep 17 00:00:00 2001 From: Thomas Parrott Date: Wed, 20 Nov 2024 13:01:02 +0000 Subject: [PATCH 2/2] snapcraft: Switch dqlite to 1.16.5 and go-dqlite to 1.21.0 And revert commit that switches LXD to go-dqlite v2. This is related to a suspected crash caused by dqlite v1.17.1 or go-dqlite v2.0.0 and beyond. Whilst its being investigated we will stick with the previously known good combination from LXD v5.21.2. Signed-off-by: Thomas Parrott --- snapcraft.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 4200a84d..d0380efe 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -272,7 +272,7 @@ parts: after: - sqlite source: https://github.com/canonical/dqlite - source-commit: ee1766cba1b52317ba216c0fbddd8457a0241df6 # v1.17.1 LTS + source-commit: 769a5ae21156ea7b1f01a937f80a3da60eb6a1bb # v1.16.5 source-type: git source-depth: 1 plugin: autotools @@ -1408,6 +1408,14 @@ parts: mkdir -p "${GOPATH}/src/github.com/canonical" ln -s "$(pwd)" "${GOPATH}/src/github.com/canonical/lxd" + # Switch dqlite to 1.16.5 and go-dqlite to 1.21.0 (known good from LXD v5.21.2) + # whilst crashes with go-dqlite v2 or dqlite 1.17 LTS are resolved. + git config user.email "noreply@lists.canonical.com" + git config user.name "LXD snap builder" + git revert e8a5357c63fb51b814e5d262479cc928fcba710d # Revert switch to go-dqlite v2 + go get github.com/canonical/go-dqlite@v1.21.0 # Switch back to go-dqlite v1 + go mod tidy + # Download the dependencies go get -v ./... override-build: |