diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 042f1af..b52f044 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -32,6 +32,9 @@ jobs: make libwaku -j cd ../.. + - name: Verify paths + run: make -C waku print-paths + - name: Verify libwaku artifacts run: make -C waku check-folders @@ -42,9 +45,7 @@ jobs: go mod vendor - name: Build waku bindings - run: | - echo "Building waku bindings from $(pwd)/waku" - make -C waku build + run: make -C waku build - name: Increase ulimit run: sudo sh -c "ulimit -n 8192" diff --git a/waku/Makefile b/waku/Makefile index d3a14bb..878889c 100644 --- a/waku/Makefile +++ b/waku/Makefile @@ -1,11 +1,17 @@ # Makefile for Waku Go Bindings # Path to logos-messaging-nim (nwaku) submodule -LMN_DIR ?= $(shell pwd)/../vendor/logos-messaging-nim +export LMN_DIR ?= $(shell pwd)/../vendor/logos-messaging-nim + +# Debugging output +print-paths: + @echo "LMN_DIR: $(LMN_DIR)" + @echo "HEADER_PATH: $(LIBWAKU_HEADER_PATH)" + @echo "LIB_PATH: $(LIBWAKU_LIB_PATH)" # Default paths for libwaku library and headers (can be overridden) -LIBWAKU_HEADER_PATH ?= $(LMN_DIR)/library -LIBWAKU_LIB_PATH ?= $(LMN_DIR)/build +export LIBWAKU_HEADER_PATH ?= $(LMN_DIR)/library +export LIBWAKU_LIB_PATH ?= $(LMN_DIR)/build export CGO_CFLAGS := -I$(LIBWAKU_HEADER_PATH)/ export CGO_LDFLAGS := -L$(LIBWAKU_LIB_PATH)/ -lwaku -Wl,-rpath,$(LIBWAKU_LIB_PATH)/ @@ -46,7 +52,7 @@ check-folders: build: @echo "Building Waku Go Bindings (manual)..." - go build . + go build -o waku-bindings . test: build @echo "Running tests (manual)..." @@ -59,4 +65,4 @@ test: build # Clean up generated files clean: @echo "Cleaning up..." - @rm -f waku-go-bindings + @rm -f waku-bindings