X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=.github%2Fworkflows%2Ftest.yml;h=52dd0ef75f04ad3f29667296d5e50ac3b5b098d4;hb=3528edaeb862e2a223a1384b90b372356d15d777;hp=cb72c66323ac4251c4a0089d31fc2d367264024c;hpb=1e69a77907df2980aaa9406e33c3ce4fd52b2d93;p=tinc

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cb72c663..52dd0ef7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -61,7 +61,8 @@ jobs:
       - name: Install tools
         run: |
           sudo apt-get install -y astyle clang-tidy-$CLANG
-          sudo update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-$CLANG 100
+          sudo update-alternatives --install /usr/bin/clang-tidy     clang-tidy     /usr/bin/clang-tidy-$CLANG     100
+          sudo update-alternatives --install /usr/bin/run-clang-tidy run-clang-tidy /usr/bin/run-clang-tidy-$CLANG 100
           curl -OL "https://github.com/koalaman/shellcheck/releases/download/v$SHELLCHECK/shellcheck-v${SHELLCHECK}.linux.x86_64.tar.xz"
           tar -C ~ --strip-components=1 --wildcards -xf ./shellcheck-*.tar.xz 'shellcheck-*/shellcheck'
           curl -o ~/shfmt -L "https://github.com/mvdan/sh/releases/download/v$SHFMT/shfmt_v${SHFMT}_linux_amd64"
@@ -83,20 +84,16 @@ jobs:
           PATH=$PATH:$HOME ./lint.py
         if: always()
 
-      - name: Run clang-tidy
-        run: sh .ci/tidy/run.sh
-        if: always()
-
-      - name: Check warnings (gcc)
+      - name: Check warnings (clang)
         run: bash .ci/warn/run.sh
         env:
-          CC: gcc-10
+          CC: clang-12
         if: always()
 
-      - name: Check warnings (clang)
+      - name: Check warnings (gcc)
         run: bash .ci/warn/run.sh
         env:
-          CC: clang-12
+          CC: gcc-10
         if: always()
 
   sanitizer:
@@ -121,6 +118,7 @@ jobs:
 
       - name: Run tests with OpenSSL 3
         run: bash .ci/sanitizers/run.sh openssl3
+        if: always()
 
       - name: Sanitize tests with default settings
         run: bash .ci/sanitizers/run.sh default
@@ -130,6 +128,10 @@ jobs:
         run: bash .ci/sanitizers/run.sh nolegacy
         if: always()
 
+      - name: Run tests with libgcrypt
+        run: bash .ci/sanitizers/run.sh gcrypt
+        if: always()
+
       - name: Upload test results
         uses: actions/upload-artifact@v2
         with:
@@ -145,8 +147,10 @@ jobs:
       matrix:
         os:
           - alpine
+          - alpine:edge
           - centos:7 # aka RHEL 7
           - almalinux:8 # aka RHEL 8
+          - almalinux:9 # aka RHEL 9
           - fedora
           - debian:buster
           - debian:bullseye