X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=.github%2Fworkflows%2Ftest.yml;h=b5392ff2643dfe1681e74b555021c68ecb8e3c50;hb=e1d5459339d7417cda45a7fa0d3c47db555ae6a9;hp=3961cae216a676f8337d730527d960441cdadd24;hpb=53b239863ea0a44270d877945fa2014ec626ad01;p=tinc

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3961cae2..b5392ff2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -54,7 +54,7 @@ jobs:
 
   static-analysis:
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 30
     steps:
       - name: Checkout code
         uses: actions/checkout@v1
@@ -115,7 +115,7 @@ jobs:
 
   sanitizer:
     runs-on: ubuntu-latest
-    timeout-minutes: 20
+    timeout-minutes: 30
     strategy:
       fail-fast: false
       matrix:
@@ -133,6 +133,9 @@ jobs:
       - name: Install deps
         run: sudo sh .ci/deps.sh
 
+      - name: Run tests with OpenSSL 3
+        run: bash .ci/sanitizers/run.sh openssl3
+
       - name: Sanitize tests with default settings
         run: bash .ci/sanitizers/run.sh default
 
@@ -143,13 +146,13 @@ jobs:
       - name: Upload test results
         uses: actions/upload-artifact@v2
         with:
-          name: tests_${{ env.ARTIFACT }}
+          name: tests_sanitizer_${{ matrix.sanitizer }}
           path: /tmp/logs/tests.*.tar.gz
         if: always()
 
   linux:
     runs-on: ubuntu-latest
-    timeout-minutes: 20
+    timeout-minutes: 30
     strategy:
       fail-fast: false
       matrix:
@@ -181,6 +184,9 @@ jobs:
       - name: Create a non-privileged user
         run: sh .ci/test/prepare.sh
 
+      - name: Run tests with OpenSSL 3
+        run: sudo -u build CI=1 sh .ci/test/run.sh openssl3
+
       - name: Run tests with default settings
         run: sudo -u build CI=1 sh .ci/test/run.sh default
 
@@ -259,11 +265,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 +291,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 +303,7 @@ jobs:
             mingw-w64-x86_64-miniupnpc
             mingw-w64-x86_64-nsis
             git
-            netcat
+            openbsd-netcat
             procps
 
       - name: Checkout code