Implement support for Argon2 password hashing.

[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 f1fed7e82fb8c32e57ac5d6974329dfd1b43c176..21296fc32ec0889fedcde99c5a1254406336050a 100644 (file)
--- a/.github/workflows/ci-macos.yml
+++ b/.github/workflows/ci-macos.yml
@@ -8,15 +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: geo_maxmind ldap mysql pgsql regex_pcre regex_posix regex_re2 regex_stdlib regex_tre sqlite3 ssl_gnutls ssl_mbedtls ssl_openssl sslrehashsignal
+      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 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
+          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: