X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=.github%2Fworkflows%2Fci-macos.yml;h=c3cd04591d2a6b655a314d75657393ea2283d885;hb=bfbd0f6cc6297f26c8348aebe9492246110d0eba;hp=ab16f5d5607f183085d06413be2841e897bafed6;hpb=2c33a3027b3db65961e58f4b45e61496ff988897;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml index ab16f5d56..c3cd04591 100644 --- 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: 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 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: