Tentative run tests in CI.

ModOrganizer2 · Jun 4, 2024 · 91ffb9e · 91ffb9e
1 parent b32b5aa
commit 91ffb9e
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -67,25 +67,25 @@ jobs:
           name: usvfs-tests_${{ matrix.arch }}
           path: ./test/bin
 
+  # merge x86 / x64 artifacts - when running x86 tests, we still need the x64 DLL
   merge-artifacts:
     runs-on: ubuntu-latest
+    name: Merge Artifacts for Tests
     needs: build
     steps:
       - name: Merge USVFS libs
         uses: actions/upload-artifact/merge@v4
         with:
           name: usvfs-libs
           pattern: usvfs-libs_*
-      - name: Merge USVFS tests
-        uses: actions/upload-artifact/merge@v4
-        with:
-          name: usvfs-tests
-          pattern: usvfs-tests_*
 
   test:
     name: Test USVFS
     needs: merge-artifacts
     runs-on: windows-2022
+    strategy:
+      matrix:
+        arch: [x86, x64]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/download-artifact@master
@@ -94,7 +94,12 @@ jobs:
           path: ./lib
       - uses: actions/download-artifact@master
         with:
-          name: usvfs-tests
+          name: usvfs-tests_${{ matrix.arch }}
           path: ./test/bin
-      - run: Get-ChildItem lib
-      - run: Get-ChildItem test/bin
+      - run: |
+          ./test/bin/shared_test_${{ matrix.arch }}.exe
+          ./test/bin/testinject_bin_${{ matrix.arch }}.exe
+          ./test/bin/thooklib_test_${{ matrix.arch }}.exe
+          ./test/bin/tinjectlib_test_${{ matrix.arch }}.exe
+          ./test/bin/tvfs_test_${{ matrix.arch }}.exe
+          ./test/bin/usvfs_test_runner_${{ matrix.arch }}.exe