chore(ci): nuke nwaku builds from pipeline

Makefile

@@ -240,13 +240,6 @@ ifeq ($(mkspecs),macx)
  endif
 endif
 
-ifeq ($(USE_NWAKU), true)
-    NWAKU_SOURCE_DIR ?= $(GIT_ROOT)/../nwaku
-    STATUSGO_MAKE_PARAMS += USE_NWAKU=true NWAKU_SOURCE_DIR="$(NWAKU_SOURCE_DIR)"
-    LIBWAKU_LIBDIR := $(NWAKU_SOURCE_DIR)/build
-    NIM_EXTRA_PARAMS += --passL:"-L$(LIBWAKU_LIBDIR)" --passL:"-lwaku"
-endif
-
 NIM_SDS_SOURCE_DIR ?= $(GIT_ROOT)/../nim-sds
 export NIM_SDS_SOURCE_DIR
 NIMSDS_LIBDIR := $(NIM_SDS_SOURCE_DIR)/build
@@ -946,12 +939,12 @@ run: $(RUN_TARGET)
 
 run-linux: nim_status_client
 	echo -e "\033[92mRunning:\033[39m bin/nim_status_client"
-	LD_LIBRARY_PATH="$(QT_LIBDIR)":"$(LIBWAKU_LIBDIR)":"$(NIMSDS_LIBDIR)":"$(STATUSGO_LIBDIR)":"$(KEYCARD_LIBDIR)":"$(STATUSQ_LIB_PATH)":"$(EXTRA_LIBS_PATH)":"$(LD_LIBRARY_PATH)" \
+	LD_LIBRARY_PATH="$(QT_LIBDIR)":"$(NIMSDS_LIBDIR)":"$(STATUSGO_LIBDIR)":"$(KEYCARD_LIBDIR)":"$(STATUSQ_LIB_PATH)":"$(EXTRA_LIBS_PATH)":"$(LD_LIBRARY_PATH)" \
 	./bin/nim_status_client $(ARGS)
 
 run-linux-gdb: nim_status_client
 	echo -e "\033[92mRunning:\033[39m bin/nim_status_client"
-	LD_LIBRARY_PATH="$(QT_LIBDIR)":"$(LIBWAKU_LIBDIR)":"$(NIMSDS_LIBDIR)":"$(STATUSGO_LIBDIR)":"$(KEYCARD_LIBDIR)":"$(STATUSQ_LIB_PATH)":"$(EXTRA_LIBS_PATH)":"$(LD_LIBRARY_PATH)" \
+	LD_LIBRARY_PATH="$(QT_LIBDIR)":"$(NIMSDS_LIBDIR)":"$(STATUSGO_LIBDIR)":"$(KEYCARD_LIBDIR)":"$(STATUSQ_LIB_PATH)":"$(EXTRA_LIBS_PATH)":"$(LD_LIBRARY_PATH)" \
 	gdb -ex=r ./bin/nim_status_client $(ARGS)
 
 run-macos: nim_status_client
@@ -984,7 +977,7 @@ NIM_TEST_FILES := $(wildcard test/nim/*.nim)
 NIM_TESTS := $(foreach test_file,$(NIM_TEST_FILES),nim-test-run/$(test_file))
 
 nim-test-run/%: | dotherside $(STATUSGO) $(QRCODEGEN)
-	LD_LIBRARY_PATH="$(QT_LIBDIR)":"$(LIBWAKU_LIBDIR)":"$(NIMSDS_LIBDIR)":"$(STATUSGO_LIBDIR)":"$(EXTRA_LIBS_PATH)":"$(LD_LIBRARY_PATH)" $(ENV_SCRIPT) \
+	LD_LIBRARY_PATH="$(QT_LIBDIR)":"$(NIMSDS_LIBDIR)":"$(STATUSGO_LIBDIR)":"$(EXTRA_LIBS_PATH)":"$(LD_LIBRARY_PATH)" $(ENV_SCRIPT) \
 	nim c $(NIM_PARAMS) $(NIM_EXTRA_PARAMS) --mm:refc --passL:"-L$(STATUSGO_LIBDIR)" --passL:"-lstatus" --passL:"$(QRCODEGEN)" -r $(subst nim-test-run/,,$@)
 
 tests-nim-linux: $(NIM_TESTS)

ci/Jenkinsfile.combined

@@ -175,22 +175,6 @@ pipeline {
               'Fdroid/arm64', jenkins.Build('status-app/systems/fdroid/arm64/package')
             )
         } } }
-        stage('Linux/x86_64 nwaku') { steps { script {
-          linux_x86_64_nwaku = getArtifacts(
-            'Linux/nwaku', build(
-              job: 'status-app/systems/linux/x86_64/package',
-              parameters: jenkins.mapToParams([USE_NWAKU: true]),
-            )
-          )
-        } } }
-        stage('MacOS/aarch64 nwaku') { steps { script {
-          macos_aarch64_nwaku = getArtifacts(
-            'MacOS/nwaku', build(
-              job: 'status-app/systems/macos/aarch64/package',
-              parameters: jenkins.mapToParams([USE_NWAKU: true]),
-            )
-          )
-        } } }
       }
     }
     stage('Publish') {

ci/Jenkinsfile.ios

@@ -79,8 +79,6 @@ pipeline {
     TESTFLIGHT_POLL_INTERVAL = "${params.TESTFLIGHT_POLL_INTERVAL}"
     /* Signing is handled by fastlane after build */
     QMAKE_EXTRA_CONFIG = "fastlane"
-    /* nwaku source directory */
-    NWAKU_SOURCE_DIR = "${env.WORKSPACE_TMP}/nwaku"
     /* nim-sds source directory */
     NIM_SDS_SOURCE_DIR = "${env.WORKSPACE_TMP}/nim-sds"
     /* Build variant: used by mobile/scripts/App.sh and mobile/fastlane/Fastfile */

ci/Jenkinsfile.linux

@@ -47,11 +47,6 @@ pipeline {
       description: 'Decides whether the mocked status-keycard-go library is built.',
       defaultValue: false
     )
-    booleanParam(
-      name: 'USE_NWAKU',
-      description: 'Whether to build with nwaku or not',
-      defaultValue: getNWakuMode(),
-    )
   }
 
   options {
@@ -75,21 +70,17 @@ pipeline {
   }
 
   environment {
-    PLATFORM = "linux/${getArch()}${(params.USE_NWAKU ?: false) ? '-nwaku' : ''}"
+    PLATFORM = "linux/${getArch()}"
     /* Improve make performance */
     MAKEFLAGS = "-j${utils.getProcCount()} V=${params.VERBOSE}"
     /* Avoid weird bugs caused by stale cache. */
     QML_DISABLE_DISK_CACHE = "true"
-    /* Set USE_NWAKU before VERSION since version.sh uses it */
-    USE_NWAKU = "${params.USE_NWAKU}"
-    /* nwaku source directory */
-    NWAKU_SOURCE_DIR = "${env.WORKSPACE_TMP}/nwaku"
     /* nim-sds source directory */
     NIM_SDS_SOURCE_DIR = "${env.WORKSPACE_TMP}/nim-sds"
     /* sets App Version in Settings */
     VERSION = "${utils.getVersion()}"
     /* Control output the filename */
-    APP_TYPE = "${utils.getAppType() + (params.USE_NWAKU ? '-experimental' : '')}"
+    APP_TYPE = "${utils.getAppType()}"
     STATUS_CLIENT_APPIMAGE = "pkg/${utils.pkgFilename(ext: 'AppImage', arch: getArch(), version: env.VERSION, type: env.APP_TYPE)}"
     STATUS_CLIENT_TARBALL = "pkg/${utils.pkgFilename(ext: 'tar.gz', arch: getArch(), version: env.VERSION, type: env.APP_TYPE)}"
     /* prevent sharing cache dir across different jobs */
@@ -154,7 +145,7 @@ pipeline {
     }
 
     stage('E2E') {
-      when { expression { utils.isPRBuild() && !(params.USE_NWAKU ?: false) } }
+      when { expression { utils.isPRBuild() } }
       steps { script {
         build(
           job: 'status-app/e2e/prs',
@@ -183,12 +174,4 @@ def getArch() {
     if (tokens.contains(arch)) { return arch }
   }
 }
-/* We extract the name of the job from currentThread because
- * before an agent is picked env is not available. */
-def getJobPathTokens() {
-    return Thread.currentThread().getName().split('/')
-}
 
-def getNWakuMode() {
-    return getJobPathTokens().contains('package-nwaku')
-}

ci/Jenkinsfile.macos

@@ -36,11 +36,6 @@ pipeline {
       description: 'Select app entitlements. Squish requires extra entitlements.',
       choices: ['resources/Entitlements.plist', 'resources/Entitlements_squish.plist']
     )
-    booleanParam(
-      name: 'USE_NWAKU',
-      description: 'Whether to build with nwaku or not',
-      defaultValue: getNWakuMode(),
-    )
     string(
       name: 'NIMFLAGS',
       description: 'Extra Nim flags. Examples: --verbosity:2 --passL:"-v" --passC:"-v"',
@@ -69,7 +64,7 @@ pipeline {
   }
 
   environment {
-    PLATFORM = "macos/${getArch()}${(params.USE_NWAKU ?: false) ? '-nwaku' : ''}"
+    PLATFORM = "macos/${getArch()}"
     /* Improve make performance */
     MAKEFLAGS = "-j${utils.getProcCount()} V=${params.VERBOSE}"
     QT_VERSION="6.9.2"
@@ -81,16 +76,12 @@ pipeline {
     PATH = "/nix/var/nix/profiles/default/bin:${env.QTDIR}/bin:${env.QTDIR}/libexec:${env.HOME}/go/bin:/usr/local/go/bin:${env.PATH}"
     /* Avoid weird bugs caused by stale cache. */
     QML_DISABLE_DISK_CACHE = "true"
-    /* Set USE_NWAKU before VERSION since version.sh uses it */
-    USE_NWAKU = "${params.USE_NWAKU}"
-    /* nwaku source directory */
-    NWAKU_SOURCE_DIR = "${env.WORKSPACE_TMP}/nwaku"
     /* nim-sds source directory */
     NIM_SDS_SOURCE_DIR = "${env.WORKSPACE_TMP}/nim-sds"
     /* Controls the App version in Settings */
     VERSION = "${utils.getVersion()}"
     /* Control output the filename */
-    APP_TYPE = "${utils.getAppType() + ( params.USE_NWAKU ? '-experimental' : '' )}"
+    APP_TYPE = "${utils.getAppType()}"
     STATUS_CLIENT_DMG = "pkg/${utils.pkgFilename(ext: 'dmg', arch: getArch(), version: env.VERSION, type: env.APP_TYPE)}"
     /* Apple Team ID for Notarization */
     MACOS_NOTARIZE_TEAM_ID = "8B5X2M6H2Y"
@@ -202,12 +193,4 @@ def getArch() {
     }
 }
 
-/* We extract the name of the job from currentThread because
- * before an agent is picked env is not available. */
-def getJobPathTokens() {
-    return Thread.currentThread().getName().split('/')
-}
 
-def getNWakuMode() {
-    return getJobPathTokens().contains('package-nwaku')
-}

ci/Jenkinsfile.tests-nim

@@ -54,7 +54,7 @@ pipeline {
     LD_LIBRARY_PATH = "$QTDIR/lib"
     /* Hack fix for params not being set in job on first run */
     NIMFLAGS = "${params.NIMFLAGS}"
-    VERBOSE =  "${params.USE_NWAKU}"
+    VERBOSE =  "${params.VERBOSE}"
     /* FIXME: figure out why NIMFLAGS are not respected */
     XDG_CACHE_HOME = "${env.WORKSPACE_TMP}/.cache"
     /* nim-sds source directory */

scripts/init_app_dir.sh

@@ -24,9 +24,6 @@ cp -R resources.rcc "${APP_DIR}/usr/"
 cp vendor/status-go/build/bin/libstatus.so "${APP_DIR}/usr/lib/"
 cp vendor/status-go/build/bin/libstatus.so.0 "${APP_DIR}/usr/lib/"
 cp "${STATUSKEYCARDGO}" "${APP_DIR}/usr/lib/"
-if [ "${USE_NWAKU}" = "true" ]; then
-  cp ${NWAKU_SOURCE_DIR}/build/libwaku.so "${APP_DIR}/usr/lib/"
-fi
 cp ${NIM_SDS_SOURCE_DIR}/build/libsds.so "${APP_DIR}/usr/lib/"
 cp "${FCITX5_QT}" "${APP_DIR}/usr/plugins/platforminputcontexts/"