fix(Makefile): nwaku target as dependency

Author: igor-sirotin

Makefile

@@ -95,9 +95,8 @@ BUILD_TAGS ?= gowaku_no_rln
 
 ifeq ($(USE_NWAKU), true)
     BUILD_TAGS += use_nwaku
-    ifndef NWAKU_SOURCE_DIR
-        $(error NWAKU_SOURCE_DIR must be set when USE_NWAKU is true)
-    endif
+    NWAKU_VERSION ?= v0.37.0-rc.3
+    NWAKU_SOURCE_DIR ?= $(GIT_ROOT)/../nwaku
     LIBWAKU := $(NWAKU_SOURCE_DIR)/build/libwaku.$(LIBWAKU_EXT)
     CGO_CFLAGS+=-I$(NWAKU_SOURCE_DIR)/library
 	CGO_LDFLAGS+=-L$(NWAKU_SOURCE_DIR)/build -lwaku -Wl,-rpath,$(NWAKU_SOURCE_DIR)/build
@@ -183,7 +182,16 @@ $(GO_CMD_BUILDS): ##@build Build any Go project from cmd folder
 	@echo "Compilation done."
 	@echo "Run \"build/bin/$(notdir $@) -h\" to view available commands."
 
-$(LIBWAKU):
+
+$(NWAKU_SOURCE_DIR): ##@build Clone nwaku
+ifeq ($(USE_NWAKU),true)
+	@echo "Cloning nwaku $(NWAKU_VERSION)..."
+	git clone --branch $(NWAKU_VERSION) https://github.com/waku-org/nwaku.git $(NWAKU_SOURCE_DIR)
+endif
+
+clone-nwaku: $(NWAKU_SOURCE_DIR)
+
+$(LIBWAKU): clone-nwaku
 ifeq ($(USE_NWAKU),true)
 	@echo "Building libwaku" $(LIBWAKU)
 	$(MAKE) -C $(NWAKU_SOURCE_DIR) SHELL=/bin/bash
@@ -200,12 +208,6 @@ clean-libwaku:
 
 rebuild-libwaku: | clean-libwaku $(LIBWAKU)
 
-clone-nwaku: NWAKU_SOURCE_DIR ?= $(GIT_ROOT)/../nwaku
-clone-nwaku: NWAKU_VERSION ?= v0.37.0-rc.3
-clone-nwaku: ##@build Clone or checkout nwaku v0.37.0-rc.3 into ../nwaku
-	@echo "Cloning nwaku $(NWAKU_VERSION)..."
-	git clone --branch $(NWAKU_VERSION) https://github.com/waku-org/nwaku.git $(NWAKU_SOURCE_DIR)
-
 statusgo: ##@build Build status-go as status-backend server
 statusgo: build/bin/status-backend
 

_assets/ci/Jenkinsfile.nwaku

@@ -65,7 +65,7 @@ pipeline {
     USE_NWAKU = "${params.USE_NWAKU}"
 
     /* nwaku source directory */
-    NWAKU_SOURCE_DIR = "${WORKSPACE}/../nwaku"
+    NWAKU_SOURCE_DIR = "${WORKSPACE_TMP}/nwaku"
 
     /* fixes nim cache collision */
     XDG_CACHE_HOME = "${env.WORKSPACE_TMP}/.cache"
@@ -79,8 +79,6 @@ pipeline {
                 sh "mkdir -p \$(dirname ${REPO_SRC})"
                 sh "ln -s ${WORKSPACE} ${REPO_SRC}"
               }
-            // Clean up any existing nwaku directory
-            sh "rm -rf ${NWAKU_SOURCE_DIR} || true"
           }
       }
   }
@@ -99,16 +97,6 @@ pipeline {
     }
   }
 
-    stage('Clone nwaku') {
-      when {
-        expression { params.USE_NWAKU == true }
-      }
-      steps { script {
-        nix.develop('make clone-nwaku', pure: false)
-      }
-    }
-  }
-
     stage('Build Static Lib') {
         steps {
             script {
@@ -143,7 +131,6 @@ pipeline {
      success { script { github.notifyPR(true) } }
      failure { script { github.notifyPR(false) } }
      cleanup {
-       sh "rm -rf ${env.NWAKU_SOURCE_DIR} || true"
        cleanWs()
        dir("${env.WORKSPACE}@tmp") { deleteDir() }
      }