X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=.github%2Fworkflows%2Ftest.yml;h=27f364b002ac06668e22715874d18d3e767f0b45;hb=08f1e0cd33812f9d972dd7c59021443a8d02d0e0;hp=0dd0de22c4e6ac699dc15d9f044a50e8a960fa8c;hpb=61a08ba67b37200659f49f14aeb03f23789b84c6;p=tinc

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0dd0de22..27f364b0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -214,7 +214,7 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - linux
-      - windows
+      - mingw
 
     steps:
       - name: Create artifact directory
@@ -272,7 +272,7 @@ jobs:
           path: /tmp/logs/tests.*.tar.gz
         if: always()
 
-  windows:
+  mingw:
     runs-on: windows-latest
     timeout-minutes: 30
 
@@ -332,3 +332,41 @@ jobs:
           name: tests_windows
           path: /tmp/logs/tests.*.tar.gz
         if: always()
+
+  msvc:
+    runs-on: windows-latest
+    timeout-minutes: 30
+
+    strategy:
+      fail-fast: false
+      matrix:
+        arch:
+          - amd64
+          - amd64_x86
+
+    steps:
+      - name: Install meson
+        run: pip3 install meson
+
+      - name: Checkout code
+        uses: actions/checkout@v1
+
+      - name: Activate dev environment
+        uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: ${{ matrix.arch }}
+
+      - name: Build (nolegacy)
+        run: .ci\windows\build.cmd nolegacy
+
+      - name: Test (nolegacy)
+        run: .ci\windows\test.cmd nolegacy
+        if: always()
+
+      - name: Build (OpenSSL)
+        run: .ci\windows\build.cmd openssl
+        if: always()
+
+      - name: Test (OpenSSL)
+        run: .ci\windows\test.cmd openssl
+        if: always()