From 2d22bc9a678f592f0466bb30c8b9773e19d564f1 Mon Sep 17 00:00:00 2001 From: Thomas Parrott Date: Wed, 5 Feb 2025 11:14:04 +0000 Subject: [PATCH] dqlite: Bump to v1.18.1 Signed-off-by: Thomas Parrott --- snapcraft.yaml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 040c029f..2778981c 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -332,9 +332,8 @@ parts: dqlite: source: https://github.com/canonical/dqlite - # XXX: We often cherry-pick for candidate builds so don't do shallow clone - #source-depth: 1 - source-commit: 6339f32a9b15b31163798de309a585927b22025f # v1.18.0 + source-depth: 1 + source-commit: 7a37bdfbf0e83edc09ecc621f02a6c7159c9a816 # v1.18.1 source-type: git plugin: autotools autotools-configure-parameters: @@ -348,17 +347,6 @@ parts: - liblz4-dev - libsqlite3-dev - libuv1-dev - override-build: | - set -ex - - # Git cherry-picks - cd ../src - git config user.email "noreply@lists.canonical.com" - git config user.name "LXD snap builder" - - git cherry-pick -x 7a37bdfbf0e83edc09ecc621f02a6c7159c9a816 # Segfault fix - - craftctl default organize: usr/bin/: bin/ usr/lib/: lib/