From: Guus Sliepen Date: Sat, 22 Jan 2022 22:26:50 +0000 (+0100) Subject: CI: Fix missing dependencies for macOS and Windows. X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=dcd4f779f4dc2c93c956407e7f70cc66d62fe0b0;p=tinc CI: Fix missing dependencies for macOS and Windows. Clang-tidy doesn't like the latest OpenSSL libraries available in Brew, so disable the clang-tidy test on macOS for now. --- diff --git a/.ci/deps.sh b/.ci/deps.sh index 096f9934..6fdd47f4 100755 --- a/.ci/deps.sh +++ b/.ci/deps.sh @@ -89,7 +89,7 @@ deps_linux() { } deps_macos() { - brew install coreutils netcat automake lzo lz4 miniupnpc libgcrypt "$@" + brew install coreutils netcat automake lzo lz4 miniupnpc libgcrypt openssl "$@" pip3 install --user compiledb } diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index db279cfa..be2401f1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -259,11 +259,6 @@ jobs: - name: Run tests with default settings run: sh .ci/test/run.sh default - - name: Run clang-tidy - run: | - export PATH="$PATH:$(brew --prefix llvm)/bin:$HOME/Library/Python/3.9/bin" - sh .ci/tidy/run.sh - - name: Run tests without legacy protocol run: sh .ci/test/run.sh nolegacy if: always() @@ -290,6 +285,8 @@ jobs: # https://packages.msys2.org/package/ install: >- base-devel + autoconf-wrapper + automake-wrapper mingw-w64-x86_64-gcc mingw-w64-x86_64-openssl mingw-w64-x86_64-libgcrypt @@ -300,7 +297,7 @@ jobs: mingw-w64-x86_64-miniupnpc mingw-w64-x86_64-nsis git - netcat + openbsd-netcat procps - name: Checkout code