X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=.github%2Fworkflows%2Ftest.yml;h=ad86e0f348860c69d4b3be856cc1f149c4ad4abe;hb=1695d8828ed6fb997dbd96e21c105ab5641b90c5;hp=52dd0ef75f04ad3f29667296d5e50ac3b5b098d4;hpb=c789d94e0508c8d61219b2b042954209166b84a1;p=tinc

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 52dd0ef7..ad86e0f3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,5 +1,9 @@
 name: Test
 
+concurrency:
+  group: test-${{ github.head_ref }}
+  cancel-in-progress: true
+
 on:
   push:
   pull_request:
@@ -9,7 +13,7 @@ on:
 
 jobs:
   cross:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     timeout-minutes: 30
     strategy:
       fail-fast: false
@@ -51,13 +55,40 @@ jobs:
           path: /tmp/logs/tests.*.tar.gz
         if: always()
 
-  static-analysis:
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
+  muon:
+    runs-on: ubuntu-22.04
+    timeout-minutes: 20
+    container:
+      image: debian:bullseye-slim
+      env:
+        CI: 1
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v1
 
+      - name: Install dependencies
+        run: SKIP_OPENSSL3=1 SKIP_MESON=1 .ci/deps.sh libpkgconf-dev
+
+      - name: Compatibility with muon
+        run: ./.ci/muon/run.sh
+
+  analysis:
+    runs-on: ubuntu-22.04
+    timeout-minutes: 30
+    steps:
+      - name: Checkout tinc
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Install dependencies
+        run: sudo SKIP_OPENSSL3=1 .ci/deps.sh autoconf automake iperf3
+
+      - name: Compatibility with older versions of tinc
+        run: sudo ./.ci/compat/run.sh
+        if: always()
+
       - name: Install tools
         run: |
           sudo apt-get install -y astyle clang-tidy-$CLANG
@@ -69,14 +100,12 @@ jobs:
           chmod 755 ~/shfmt ~/shellcheck
           python3 -m venv /tmp/venv
           . /tmp/venv/bin/activate
-          pip3 install black pylint mypy
+          pip3 install black pylint mypy markflow
         env:
           CLANG: 11
-          SHELLCHECK: 0.7.2
-          SHFMT: 3.3.0
-
-      - name: Install deps
-        run: sudo SKIP_OPENSSL3=1 sh .ci/deps.sh
+          SHELLCHECK: 0.8.0
+          SHFMT: 3.5.0
+        if: always()
 
       - name: Lint/typecheck/check formatting on C/shell/Python code
         run: |
@@ -93,11 +122,23 @@ jobs:
       - name: Check warnings (gcc)
         run: bash .ci/warn/run.sh
         env:
-          CC: gcc-10
+          CC: gcc-11
+        if: always()
+
+      - name: Archive test results
+        run: sudo tar -caf tests.tar.gz /usr/local/etc
+        continue-on-error: true
+        if: always()
+
+      - name: Upload test results
+        uses: actions/upload-artifact@v2
+        with:
+          name: tests_compat
+          path: tests.tar.gz
         if: always()
 
   sanitizer:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     timeout-minutes: 30
     strategy:
       fail-fast: false
@@ -114,7 +155,9 @@ jobs:
         uses: actions/checkout@v1
 
       - name: Install deps
-        run: sudo sh .ci/deps.sh
+        run: |
+          sudo sh .ci/deps.sh
+          sudo pip3 install --upgrade cryptography
 
       - name: Run tests with OpenSSL 3
         run: bash .ci/sanitizers/run.sh openssl3
@@ -140,7 +183,7 @@ jobs:
         if: always()
 
   linux:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     timeout-minutes: 30
     strategy:
       fail-fast: false
@@ -213,7 +256,7 @@ jobs:
 
   pkg-publish:
     if: always() && (github.ref == 'refs/heads/1.1' || startsWith(github.ref, 'refs/tags/release-'))
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     continue-on-error: true
     needs:
       - linux
@@ -248,7 +291,7 @@ jobs:
         if: startsWith(github.ref, 'refs/tags/')
 
   macos:
-    runs-on: macos-latest
+    runs-on: macos-12
     timeout-minutes: 20
 
     steps: