diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a903982f0..b2de4e50e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -158,8 +158,8 @@ jobs: export NIMFLAGS="--colors:off -d:chronicles_colors:none" export USE_LIBBACKTRACE=0 - make V=1 LOG_LEVEL=DEBUG POSTGRES=$postgres_enabled test - make V=1 LOG_LEVEL=DEBUG POSTGRES=$postgres_enabled testwakunode2 + make V=1 POSTGRES=$postgres_enabled test + make V=1 POSTGRES=$postgres_enabled testwakunode2 build-docker-image: needs: changes diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 8c7bf6f9b..09ef05a5d 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -104,12 +104,12 @@ jobs: - name: Building wakunode2.exe run: | export PATH="$GITHUB_WORKSPACE/.nim_runtime/bin:$HOME/.nimble/bin:$PATH" - make wakunode2 LOG_LEVEL=DEBUG V=3 -j${{ env.NPROC }} + make wakunode2 V=3 -j${{ env.NPROC }} - name: Building libwaku.dll run: | export PATH="$GITHUB_WORKSPACE/.nim_runtime/bin:$HOME/.nimble/bin:$PATH" - make libwaku STATIC=0 LOG_LEVEL=DEBUG V=1 -j + make libwaku STATIC=0 V=1 -j - name: Check Executable run: | diff --git a/Dockerfile b/Dockerfile index 5b16b9eee..412d0977a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,6 @@ FROM rustlang/rust:nightly-alpine3.19 AS nim-build ARG NIMFLAGS ARG MAKE_TARGET=wakunode2 ARG NIM_COMMIT -ARG LOG_LEVEL=TRACE ARG HEAPTRACK_BUILD=0 # Get build tools and required header files @@ -27,7 +26,7 @@ RUN if [ "$HEAPTRACK_BUILD" = "1" ]; then \ RUN make -j$(nproc) deps QUICK_AND_DIRTY_COMPILER=1 ${NIM_COMMIT} # Build the final node binary -RUN make -j$(nproc) ${NIM_COMMIT} $MAKE_TARGET LOG_LEVEL=${LOG_LEVEL} NIMFLAGS="${NIMFLAGS}" +RUN make -j$(nproc) ${NIM_COMMIT} $MAKE_TARGET NIMFLAGS="${NIMFLAGS}" # PRODUCTION IMAGE ------------------------------------------------------------- diff --git a/Makefile b/Makefile index 3ea6514a9..08e9f5d13 100644 --- a/Makefile +++ b/Makefile @@ -349,7 +349,6 @@ docker-image: docker build \ --build-arg="MAKE_TARGET=$(MAKE_TARGET)" \ --build-arg="NIMFLAGS=$(DOCKER_IMAGE_NIMFLAGS)" \ - --build-arg="LOG_LEVEL=$(LOG_LEVEL)" \ --build-arg="HEAPTRACK_BUILD=$(HEAPTRACKER)" \ --label="commit=$(shell git rev-parse HEAD)" \ --label="version=$(GIT_VERSION)" \ @@ -382,7 +381,6 @@ docker-liteprotocoltester: docker build \ --build-arg="MAKE_TARGET=liteprotocoltester" \ --build-arg="NIMFLAGS=$(DOCKER_LPT_NIMFLAGS)" \ - --build-arg="LOG_LEVEL=TRACE" \ --label="commit=$(shell git rev-parse HEAD)" \ --label="version=$(GIT_VERSION)" \ --target $(if $(filter deploy,$(DOCKER_LPT_TAG)),deployment_lpt,standalone_lpt) \ diff --git a/waku.nimble b/waku.nimble index d34ceb926..a7a1b2dd2 100644 --- a/waku.nimble +++ b/waku.nimble @@ -367,7 +367,7 @@ task libWakuIOS, "Build the mobile bindings for iOS": let extraParams = "-d:chronicles_log_level=ERROR" buildMobileIOS srcDir, extraParams -proc test(name: string, params = "-d:chronicles_log_level=DEBUG") = +proc test(name: string, params = "-d:chronicles_log_level=TRACE") = # XXX: When running `> NIM_PARAMS="-d:chronicles_log_level=INFO" make test2` # I expect compiler flag to be overridden, however it stays with whatever is # specified here. @@ -376,7 +376,7 @@ proc test(name: string, params = "-d:chronicles_log_level=DEBUG") = ### Waku common tasks task testcommon, "Build & run common tests": - test "all_tests_common", "-d:chronicles_log_level=WARN -d:chronosStrictException" + test "all_tests_common", "-d:chronicles_log_level=TRACE -d:chronosStrictException" ### Waku tasks task wakunode2, "Build Waku v2 cli node": @@ -440,7 +440,7 @@ task chat2bridge, "Build chat2bridge": task liteprotocoltester, "Build liteprotocoltester": let name = "liteprotocoltester" - buildBinary name, "apps/liteprotocoltester/" + buildBinary name, "apps/liteprotocoltester/", "-d:chronicles_log_level=TRACE" task lightpushwithmix, "Build lightpushwithmix": let name = "lightpush_publisher_mix"