File tree Expand file tree Collapse file tree 1 file changed +13
-8
lines changed Expand file tree Collapse file tree 1 file changed +13
-8
lines changed Original file line number Diff line number Diff line change @@ -67,25 +67,25 @@ jobs:
67
67
name : usvfs-tests_${{ matrix.arch }}
68
68
path : ./test/bin
69
69
70
+ # merge x86 / x64 artifacts - when running x86 tests, we still need the x64 DLL
70
71
merge-artifacts :
71
72
runs-on : ubuntu-latest
73
+ name : Merge Artifacts for Tests
72
74
needs : build
73
75
steps :
74
76
- name : Merge USVFS libs
75
77
uses : actions/upload-artifact/merge@v4
76
78
with :
77
79
name : usvfs-libs
78
80
pattern : usvfs-libs_*
79
- - name : Merge USVFS tests
80
- uses : actions/upload-artifact/merge@v4
81
- with :
82
- name : usvfs-tests
83
- pattern : usvfs-tests_*
84
81
85
82
test :
86
83
name : Test USVFS
87
84
needs : merge-artifacts
88
85
runs-on : windows-2022
86
+ strategy :
87
+ matrix :
88
+ arch : [x86, x64]
89
89
steps :
90
90
- uses : actions/checkout@v4
91
91
- uses : actions/download-artifact@master
94
94
path : ./lib
95
95
- uses : actions/download-artifact@master
96
96
with :
97
- name : usvfs-tests
97
+ name : usvfs-tests_${{ matrix.arch }}
98
98
path : ./test/bin
99
- - run : Get-ChildItem lib
100
- - run : Get-ChildItem test/bin
99
+ - run : |
100
+ ./test/bin/shared_test_${{ matrix.arch }}.exe
101
+ ./test/bin/testinject_bin_${{ matrix.arch }}.exe
102
+ ./test/bin/thooklib_test_${{ matrix.arch }}.exe
103
+ ./test/bin/tinjectlib_test_${{ matrix.arch }}.exe
104
+ ./test/bin/tvfs_test_${{ matrix.arch }}.exe
105
+ ./test/bin/usvfs_test_runner_${{ matrix.arch }}.exe
You can’t perform that action at this time.
0 commit comments