Skip to content

Commit

Permalink
Switch to core24 and dqlite with builtin raft (#13)
Browse files Browse the repository at this point in the history
  • Loading branch information
roosterfish authored Oct 4, 2024
2 parents 4803931 + a10ca06 commit 8983a97
Showing 1 changed file with 6 additions and 26 deletions.
32 changes: 6 additions & 26 deletions snapcraft.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: microcloud
base: core22
base: core24
assumes:
- snapd2.59
version: git
Expand Down Expand Up @@ -42,18 +42,19 @@ apps:

parts:
dqlite:
after:
- raft
source: https://github.com/canonical/dqlite
source-type: git
source-depth: 1
source-type: git
plugin: autotools
autotools-configure-parameters:
- --prefix=
- --enable-build-raft
stage-packages:
- liblz4-1
- libsqlite3-0
- libuv1
build-packages:
- liblz4-dev
- libsqlite3-dev
- libuv1-dev
- pkg-config
Expand All @@ -62,26 +63,6 @@ parts:
prime:
- lib/libdqlite*so*
- lib/*/libuv*

raft:
source: https://github.com/canonical/raft
source-type: git
source-depth: 1
plugin: autotools
autotools-configure-parameters:
- --prefix=
stage-packages:
- libuv1
- liblz4-1
build-packages:
- libuv1-dev
- liblz4-dev
- pkg-config
organize:
usr/lib/: lib/
prime:
- lib/libraft*so*
- lib/*/libuv.so*
#- lib/*/liblz4.so* # use liblz4.so from the base snap

microcloud:
Expand All @@ -98,7 +79,7 @@ parts:
set -ex
# Download the dependencies
go get -d -v -tags=agent ./...
go get -v -tags=agent ./...
override-build: |
set -ex
Expand All @@ -117,7 +98,6 @@ parts:
strip:
after:
- dqlite
- raft
- microcloud
plugin: nil
override-prime: |
Expand Down

0 comments on commit 8983a97

Please sign in to comment.