Add test for meson-wrap

Signed-off-by: Jonathan Dieter <jdieter@gmail.com>

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6f3bf827a816149dabbcdb4c137846a685ddd94f..7c9c0a5e78d8d0d23c70a7d043a15e392069d9c3 100644 (file)
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -28,10 +28,10 @@ jobs:
       - name: Run zchunk tests
         run: ./autotest/${{ matrix.container_directory }}/test.sh
 
-  windows:
+  windows-mamba:
     runs-on: windows-latest
 
-    name: Compile and run tests (windows-latest)
+    name: Compile and run tests (windows-latest-mamba)
     steps:
       - uses: actions/checkout@v2
 
@@ -68,6 +68,46 @@ jobs:
           cd builddir
           ninja test
 
+  windows-meson-wrap:
+    runs-on: windows-latest
+
+    name: Compile and run tests (windows-latest-meson-wrap)
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/checkout@v2
+        with:
+          repository: wolfv/argp-standalone
+          path: argp-standalone
+
+      - uses: actions/setup-python@v1
+        with:
+          python-version: '3.x'
+
+      - name: Install meson and ninja
+        run: pip install meson ninja
+
+      - name: Compile argp-standalone
+        shell: cmd /C CALL {0}
+        run: |
+          cd argp-standalone
+          meson setup --vsenv builddir
+          meson compile -C builddir
+          meson install -C builddir
+
+      - name: Compile zchunk
+        shell: cmd /C CALL {0}
+        run: |
+          meson wrap install zstd
+          meson setup --vsenv builddir
+          meson compile -C builddir
+
+      - name: Run zchunk tests
+        shell: cmd /C CALL {0}
+        run: |
+          cd builddir
+          ninja test
+
   macos:
     runs-on: macos-latest
 

diff --git a/subprojects/zstd.wrap b/subprojects/zstd.wrap
index 68691f829ca21fd55b066d9ef40aee13e169f716..60791f74c311835cec4b32fd96d26972ccb9af03 100644 (file)
--- a/subprojects/zstd.wrap
+++ b/subprojects/zstd.wrap
@@ -8,4 +8,4 @@ patch_filename = zstd-1.4.5-1-wrap.zip
 patch_hash = fd9cb7b9c8f7092ef1597ff68f170beef65fcf33e575a621955cf405a41db1cc
 
 [provide]
-libzstd = libzstd_dep
+zstd = zstd_dep