From 01b58d79f0539e5af39845fb9a7b515728152196 Mon Sep 17 00:00:00 2001 From: darshankabariya Date: Fri, 19 Dec 2025 15:58:52 +0530 Subject: [PATCH] chore: daily ci improvement --- README.md | 27 +++++++++++++++++---------- go.mod | 4 +--- go.sum | 6 ++---- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index d0aafaf..bb8df0b 100644 --- a/README.md +++ b/README.md @@ -12,21 +12,28 @@ go get -u github.com/logos-messaging/logos-messaging-go-bindings `libwaku` (from `logos-messaging-nim`) is required at compile-time. The Makefile gives you two ways to satisfy this: -1. **Automatic clone (default)** – if `LMN_DIR` is **unset**, running +1. **Reuse an existing clone** – if you already have `logos-messaging-nim` checked out, point the build to it: + ### Manual build without Makefile + If you want to invoke `go build` or `go test` directly, export the same variables the Makefile sets: + ```bash + # path to your existing logos-messaging-nim clone + export LMN_DIR=/path/to/logos-messaging-nim + export CGO_CFLAGS="-I${LMN_DIR}/library/" + export CGO_LDFLAGS="-L${LMN_DIR}/build/ -lwaku -Wl,-rpath,${LMN_DIR}/build/" + + # compile all packages + go build ./... + + # run a specific test (no cache) + go test ./waku -count=1 -run TestConnectedPeersInfo -v + ``` + +2. **Automatic clone (default)** – if `LMN_DIR` is **unset**, running ```bash make -C waku build ``` will clone a shallow copy of `logos-messaging-nim` into `third_party/nwaku`, build `libwaku`, and compile the Go bindings. This is what CI uses. -2. **Reuse an existing clone** – if you already have `logos-messaging-nim` checked out, point the build to it: - ```bash - export LMN_DIR=/path/to/your/logos-messaging-nim - make -C waku build - ``` - Existing `libwaku` artifacts under that path are reused, so this is fast for local development. - -The Makefile sets `CGO_CFLAGS` and `CGO_LDFLAGS` automatically; no extra environment is required. - > **Downstream projects**: When importing `logos-messaging-go-bindings` in another Go module you must ensure `LMN_DIR` is exported (or vendor `libwaku`) before running `go build`. Otherwise the CGO step will fail. --- diff --git a/go.mod b/go.mod index 6f36b1e..776a70d 100644 --- a/go.mod +++ b/go.mod @@ -18,8 +18,6 @@ replace github.com/mutecomm/go-sqlcipher/v4 v4.4.2 => github.com/status-im/go-sq replace github.com/libp2p/go-libp2p-pubsub v0.12.0 => github.com/logos-messaging/go-libp2p-pubsub v0.12.0-gowaku.0.20240823143342-b0f2429ca27f -replace github.com/logos-messaging/go-discover => github.com/waku-org/go-discover v0.0.0-20240506173252-4912704efdc5 - require ( github.com/beevik/ntp v0.3.0 // indirect github.com/cenkalti/backoff/v3 v3.2.2 @@ -75,7 +73,7 @@ require ( github.com/prometheus/common v0.55.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect - github.com/logos-messaging/go-discover v0.0.0-20240506173252-4912704efdc5 // indirect + github.com/waku-org/go-discover v0.0.0-20240506173252-4912704efdc5 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect golang.org/x/net v0.28.0 // indirect diff --git a/go.sum b/go.sum index 52a799e..cccc7ab 100644 --- a/go.sum +++ b/go.sum @@ -334,12 +334,8 @@ github.com/libp2p/go-reuseport v0.4.0 h1:nR5KU7hD0WxXCJbmw7r2rhRYruNRl2koHw8fQsc github.com/libp2p/go-reuseport v0.4.0/go.mod h1:ZtI03j/wO5hZVDFo2jKywN6bYKWLOy8Se6DrI2E1cLU= github.com/libp2p/go-yamux/v4 v4.0.1 h1:FfDR4S1wj6Bw2Pqbc8Uz7pCxeRBPbwsBbEdfwiCypkQ= github.com/libp2p/go-yamux/v4 v4.0.1/go.mod h1:NWjl8ZTLOGlozrXSOZ/HlfG++39iKNnM5wwmtQP1YB4= -github.com/logos-messaging/go-discover v0.0.0-20240506173252-4912704efdc5 h1:4K3IS97JryAEV8pRXB//qPcg+8bPXl/O+AOLt3FeCKc= -github.com/logos-messaging/go-discover v0.0.0-20240506173252-4912704efdc5/go.mod h1:eBHgM6T4EG0RZzxpxKy+rGz/6Dw2Nd8DWxS0lm9ESDw= github.com/logos-messaging/go-libp2p-pubsub v0.12.0-gowaku.0.20240823143342-b0f2429ca27f h1:+a4AeS10yrOi/my2G56rwbLIg4GOkMiyF9Y3lsdFs+o= github.com/logos-messaging/go-libp2p-pubsub v0.12.0-gowaku.0.20240823143342-b0f2429ca27f/go.mod h1:Oi0zw9aw8/Y5GC99zt+Ef2gYAl+0nZlwdJonDyOz/sE= -github.com/waku-org/go-waku v0.8.1-0.20241028194639-dd82c24e0057 h1:C/UCg3Z4avOxvZEvY0JzYmeAoqZUBnSE6PK/SaxfEAM= -github.com/waku-org/go-waku v0.8.1-0.20241028194639-dd82c24e0057/go.mod h1:1BRnyg2mQ2aBNLTBaPq6vEvobzywGykPOhGQFbHGf74= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd h1:br0buuQ854V8u83wA0rVZ8ttrq5CpaPZdvrK0LP2lOk= @@ -555,7 +551,9 @@ github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/X github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= +github.com/waku-org/go-discover v0.0.0-20240506173252-4912704efdc5 h1:4K3IS97JryAEV8pRXB//qPcg+8bPXl/O+AOLt3FeCKc= github.com/waku-org/go-discover v0.0.0-20240506173252-4912704efdc5/go.mod h1:eBHgM6T4EG0RZzxpxKy+rGz/6Dw2Nd8DWxS0lm9ESDw= +github.com/waku-org/go-waku v0.8.1-0.20241028194639-dd82c24e0057 h1:C/UCg3Z4avOxvZEvY0JzYmeAoqZUBnSE6PK/SaxfEAM= github.com/waku-org/go-waku v0.8.1-0.20241028194639-dd82c24e0057/go.mod h1:1BRnyg2mQ2aBNLTBaPq6vEvobzywGykPOhGQFbHGf74= github.com/willf/bitset v1.1.3/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= github.com/wlynxg/anet v0.0.4 h1:0de1OFQxnNqAu+x2FAKKCVIrnfGKQbs7FQz++tB0+Uw=