Fix not parsing connect class hosts for inherited classes.

[user/henk/code/inspircd.git] / .github / workflows / ci-macos.yml

diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml
index c706b754215b3e464e302d7ef2aa03c2e08e5eec..c3cd04591d2a6b655a314d75657393ea2283d885 100644 (file)
--- a/.github/workflows/ci-macos.yml
+++ b/.github/workflows/ci-macos.yml
@@ -8,16 +8,19 @@ jobs:
     env:
       CXXFLAGS: -std=${{ matrix.standard }} -I/usr/local/opt/openssl@1.1/include -Wno-error=deprecated-declarations
       LDFLAGS: -L/usr/local/opt/openssl@1.1/lib
-      PKG_CONFIG_PATH: /usr/local/opt/openssl@1.1/lib/pkgconfig
-      TEST_BUILD_MODULES: m_geo_maxmind.cpp,m_ldap.cpp,m_mysql.cpp,m_pgsql.cpp,m_regex_pcre.cpp,m_regex_posix.cpp,m_regex_re2.cpp,m_regex_stdlib.cpp,m_regex_tre.cpp,m_sqlite3.cpp,m_ssl_gnutls.cpp,m_ssl_mbedtls.cpp,m_ssl_openssl.cpp,m_sslrehashsignal.cpp
+      PKG_CONFIG_PATH: /usr/local/opt/openssl@1.1/lib/pkgconfig:/usr/local/opt/sqlite/lib/pkgconfig
+      TEST_BUILD_MODULES: argon2 geo_maxmind ldap mysql pgsql regex_pcre regex_posix regex_re2 regex_stdlib regex_tre sqlite3 ssl_gnutls ssl_mbedtls ssl_openssl sslrehashsignal
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies
         run: |
-          brew update
-          brew install pkg-config gnutls libmaxminddb libpq mbedtls mysql-client openssl@1.1 pcre re2 sqlite3 tre
-          brew link --force libpq
-          brew link --force mysql-client
+          brew update || true
+          for PACKAGE in pkg-config argon2 gnutls libmaxminddb libpq mbedtls mysql-client openssl@1.1 pcre re2 sqlite tre;
+          do
+            brew install $PACKAGE || brew upgrade $PACKAGE
+          done
+          brew link --force --overwrite libpq
+          brew link --force --overwrite mysql-client
       - name: Run test-build
         run: ./tools/test-build c++
     strategy: