From 15c94bef77171422df4600a73efbfe62e1f5e226 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Mon, 8 Jun 2026 21:42:02 +0100 Subject: [PATCH 1/5] Add CI job for ZNC without SSL support --- .github/workflows/build.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f1a0b56b..6a04cd90 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,6 +21,21 @@ jobs: name: codecov debug results ${{ github.job }} path: "/tmp/codecov.*.gz" + nossl: + name: NoSSL + runs-on: ubuntu-24.04 + steps: + - uses: actions/checkout@v6 + with: + submodules: true + - run: source .github/ubuntu_deps.sh + - run: | + export CFGFLAGS="--disable-openssl" + source .github/build.sh + - uses: codecov/codecov-action@v6 + with: + name: ${{ github.job }} + tarball: name: Tarball runs-on: ubuntu-24.04 From 197a235764710beaac8c650a7b34c35977ee3b63 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Mon, 8 Jun 2026 21:54:17 +0100 Subject: [PATCH 2/5] test: Don't wait for SSL question if built without SSL And don't hardcode 6667 in preparation for #2022 --- test/integration/framework/znctest.cpp | 4 +++- test/integration/znctestconfig.h.cmake.in | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/test/integration/framework/znctest.cpp b/test/integration/framework/znctest.cpp index 4c521fd7..5165e46d 100644 --- a/test/integration/framework/znctest.cpp +++ b/test/integration/framework/znctest.cpp @@ -46,8 +46,10 @@ void WriteConfig(QString path) { p.ReadUntil("Set up a network?"); p.Write(); p.ReadUntil("Name [libera]"); p.Write("test"); p.ReadUntil("Server host (host only)"); p.Write("unix:" + path.toUtf8() + "/inttest.ircd"); +#if HAVE_LIBSSL p.ReadUntil("Server uses SSL?"); p.Write(); - p.ReadUntil("6667"); p.Write(); +#endif + p.ReadUntil("Server port"); p.Write(); p.ReadUntil("password"); p.Write(); p.ReadUntil("channels"); p.Write(); p.ReadUntil("Launch ZNC now?"); p.Write("no"); diff --git a/test/integration/znctestconfig.h.cmake.in b/test/integration/znctestconfig.h.cmake.in index 6bb9882b..bec0457a 100644 --- a/test/integration/znctestconfig.h.cmake.in +++ b/test/integration/znctestconfig.h.cmake.in @@ -20,5 +20,6 @@ #cmakedefine WANT_PYTHON 1 #cmakedefine WANT_PERL 1 #cmakedefine HAVE_I18N 1 +#cmakedefine HAVE_LIBSSL 1 #endif /* ZNCTESTCONFIG_H */ From 14846166c634f179ecc403d088714c3f46e7cc7a Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Mon, 8 Jun 2026 22:00:37 +0100 Subject: [PATCH 3/5] Update test/integration/framework/znctest.cpp Co-authored-by: dgw --- test/integration/framework/znctest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/framework/znctest.cpp b/test/integration/framework/znctest.cpp index 5165e46d..fc0dcb8a 100644 --- a/test/integration/framework/znctest.cpp +++ b/test/integration/framework/znctest.cpp @@ -49,7 +49,7 @@ void WriteConfig(QString path) { #if HAVE_LIBSSL p.ReadUntil("Server uses SSL?"); p.Write(); #endif - p.ReadUntil("Server port"); p.Write(); + p.ReadUntil("Server port"); p.Write(); p.ReadUntil("password"); p.Write(); p.ReadUntil("channels"); p.Write(); p.ReadUntil("Launch ZNC now?"); p.Write("no"); From ad12a6011d319f245293a31c1480c9cb136ce806 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Mon, 8 Jun 2026 22:07:11 +0100 Subject: [PATCH 4/5] Skip tests which require SSL --- test/integration/tests/modules.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/integration/tests/modules.cpp b/test/integration/tests/modules.cpp index e954051f..628e8f5c 100644 --- a/test/integration/tests/modules.cpp +++ b/test/integration/tests/modules.cpp @@ -139,6 +139,10 @@ TEST_F(ZNCTest, WatchModule) { } TEST_F(ZNCTest, ModuleCrypt) { +#ifndef HAVE_LIBSSL + GTEST_SKIP() << "SSL is disabled"; +#endif + QFile conf(m_dir.path() + "/configs/znc.conf"); ASSERT_TRUE(conf.open(QIODevice::Append | QIODevice::Text)); QTextStream(&conf) << "ServerThrottle = 1\n"; @@ -389,6 +393,10 @@ TEST_F(ZNCTest, SaslAuthPlainImapAuth) { } TEST_F(ZNCTest, SaslAuthExternal) { +#ifndef HAVE_LIBSSL + GTEST_SKIP() << "SSL is disabled"; +#endif + int port = PickPortNumber(); auto znc = Run(); From 53ffcc909b0da701d0458afd57647bfdd0cee769 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Mon, 8 Jun 2026 22:43:13 +0100 Subject: [PATCH 5/5] add include --- test/integration/framework/znctest.h | 1 + 1 file changed, 1 insertion(+) diff --git a/test/integration/framework/znctest.h b/test/integration/framework/znctest.h index 72c6ff58..a7e810de 100644 --- a/test/integration/framework/znctest.h +++ b/test/integration/framework/znctest.h @@ -27,6 +27,7 @@ #include #include "base.h" +#include "znctestconfig.h" namespace znc_inttest {