Merge remote-tracking branch 'origin/master' into change_license_mit

# Conflicts: # .appveyor.yml
dotpcap · Jan 3, 2024 · 005567d · 005567d
2 parents eeaf377 + dbf3b58
commit 005567d
Showing 1 changed file with 18 additions and 30 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -17,37 +17,25 @@ branches:
 
 image:
   - Visual Studio 2022
-  - Ubuntu1804
   - macos
 
 for:
--
-  matrix:
-    only:
-      - image: Visual Studio 2022
-  install:
-    - ps: .\scripts\install-windows.ps1
-    - ps: .\scripts\Install-npcap.ps1
-    - ps: .\scripts\install-winpkfilter.ps1
-  build_script:
-    - dotnet build -c Release
-  test_script:
-    - bash scripts/test.sh --filter "TestCategory!=RemotePcap&TestCategory!=WinDivert"
+  - matrix:
+      only:
+        - image: Visual Studio 2022
+    install:
+      - ps: .\scripts\install-windows.ps1
+      - ps: .\scripts\Install-npcap.ps1
+      - ps: .\scripts\install-winpkfilter.ps1
+    build_script:
+      - dotnet build -c Release
+    test_script:
+      - bash scripts/test.sh --filter "TestCategory!=RemotePcap&TestCategory!=WinDivert"
 
--
-  matrix:
-    only:
-      - image: Ubuntu1804
-  install:
-    - sudo -E bash scripts/install-libpcap.sh
-  test_script:
-    - sudo -E bash scripts/test.sh --filter "TestCategory!=Tunneling"
-
--
-  matrix:
-    only:
-      - image: macos
-  install:
-    - sudo -E bash scripts/install-libpcap.sh
-  test_script:
-    - sudo -E bash scripts/test.sh
+  - matrix:
+      only:
+        - image: macos
+    install:
+      - sudo -E bash scripts/install-libpcap.sh
+    test_script:
+      - sudo -E bash scripts/test.sh