Skip to content

Commit eaf36a6

Browse files
authored
Windows CI fix (#176)
* Check error code and abort. * Use 32 bit version of reg.exe for 32bit binaries.
1 parent 792682a commit eaf36a6

1 file changed

Lines changed: 12 additions & 4 deletions

File tree

.github/workflows/windows.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,20 @@ jobs:
113113
working-directory: ${{runner.workspace}}/OpenCL-ICD-Loader/build
114114
shell: cmd
115115
run: |
116-
reg ADD HKEY_LOCAL_MACHINE\SOFTWARE\Khronos\OpenCL\Vendors /v %GITHUB_WORKSPACE%/build/Release/OpenCLDriverStub.dll /t REG_DWORD /d 0
116+
if /I "${{matrix.BIN}}"=="x64" set REG=reg
117+
if /I "${{matrix.BIN}}"=="x86" set REG=%systemroot%\Syswow64\reg.exe
118+
%REG% ADD HKEY_LOCAL_MACHINE\SOFTWARE\Khronos\OpenCL\Vendors /v %GITHUB_WORKSPACE%/build/Release/OpenCLDriverStub.dll /t REG_DWORD /d 0
117119
%CTEST_EXE% -C Release --output-on-failure --parallel %NUMBER_OF_PROCESSORS%
118-
reg DELETE HKEY_LOCAL_MACHINE\SOFTWARE\Khronos\OpenCL\Vendors /v %GITHUB_WORKSPACE%/build/Release/OpenCLDriverStub.dll /f
119-
reg ADD HKEY_LOCAL_MACHINE\SOFTWARE\Khronos\OpenCL\Vendors /v %GITHUB_WORKSPACE%/build/Debug/OpenCLDriverStub.dll /t REG_DWORD /d 0
120+
if errorlevel 1 (
121+
exit /b %errorlevel%
122+
)
123+
%REG% DELETE HKEY_LOCAL_MACHINE\SOFTWARE\Khronos\OpenCL\Vendors /v %GITHUB_WORKSPACE%/build/Release/OpenCLDriverStub.dll /f
124+
%REG% ADD HKEY_LOCAL_MACHINE\SOFTWARE\Khronos\OpenCL\Vendors /v %GITHUB_WORKSPACE%/build/Debug/OpenCLDriverStub.dll /t REG_DWORD /d 0
120125
%CTEST_EXE% -C Debug --output-on-failure --parallel %NUMBER_OF_PROCESSORS%
121-
reg DELETE HKEY_LOCAL_MACHINE\SOFTWARE\Khronos\OpenCL\Vendors /v %GITHUB_WORKSPACE%/build/Debug/OpenCLDriverStub.dll /f
126+
if errorlevel 1 (
127+
exit /b %errorlevel%
128+
)
129+
%REG% DELETE HKEY_LOCAL_MACHINE\SOFTWARE\Khronos\OpenCL\Vendors /v %GITHUB_WORKSPACE%/build/Debug/OpenCLDriverStub.dll /f
122130
123131
- name: Install
124132
shell: cmd

0 commit comments

Comments
 (0)