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 <[email protected]>
canonical · Nov 20, 2024 · 85e764b · 85e764b
1 parent 8fad69b
commit 85e764b
Showing 1 changed file with 8 additions and 1 deletion.
diff --git 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,13 @@ parts:
       mkdir -p "${GOPATH}/src/github.com/canonical"
       ln -s "$(pwd)" "${GOPATH}/src/github.com/canonical/lxd"
 
+      # Revert go-dqlite whilst crashes with go-dqlite v2 or dqlite 1.17 LTS are resolved.
+      git config user.email "[email protected]"
+      git config user.name "LXD snap builder"
+      git revert e8a5357c63fb51b814e5d262479cc928fcba710d # Revert switch to go-dqlite v2
+      go get github.com/canonical/[email protected] # Switch back to go-dqlite v1
+      go mod tidy
+
       # Download the dependencies
       go get -v ./...
     override-build: |