Merge pull request #2023 from DarthGandalf/nossl

Add CI job for ZNC without SSL support

.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

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");

test/integration/framework/znctest.h

@@ -27,6 +27,7 @@
 #include <QUrlQuery>
 
 #include "base.h"
+#include "znctestconfig.h"
 
 namespace znc_inttest {
 

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();

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 */