Skip to content

Commit a365059

Browse files
authored
Refactor build process for ThunderClientLibraries
1 parent c98177e commit a365059

1 file changed

Lines changed: 13 additions & 8 deletions

File tree

.github/workflows/Build ThunderClientLibraries on Windows.yml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ on:
1212

1313
env:
1414
cryptography: ThunderClientLibraries\Source\cryptography\Cryptography.vcxproj
15-
devEnv: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\devenv.com
1615
deviceinfo: ThunderClientLibraries\Source\deviceinfo\DeviceInfo.vcxproj
1716
displayinfo: ThunderClientLibraries\Source\displayinfo\displayinfo.vcxproj
1817
ocdm: ThunderClientLibraries\Source\ocdm\ocdm.vcxproj
@@ -119,14 +118,20 @@ jobs:
119118

120119
- name: Build ThunderClientLibraries
121120
shell: cmd
122-
run: >
121+
run: |
122+
for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.VisualStudio.Component.CoreEditor -property productPath`) do set "VS_PATH=%%i"
123+
if not defined VS_PATH (echo ERROR: Visual Studio not found && exit /b 1)
124+
125+
set "devEnv=%VS_PATH:.exe=.com%"
123126
cd ThunderOnWindows
124-
&& "%devEnv%" /Build "${{matrix.type}}|x${{matrix.version}}" /Project "%cryptography%" "%solution%"
125-
&& "%devEnv%" /Build "${{matrix.type}}|x${{matrix.version}}" /Project "%deviceinfo%" "%solution%"
126-
&& "%devEnv%" /Build "${{matrix.type}}|x${{matrix.version}}" /Project "%displayinfo%" "%solution%"
127-
&& "%devEnv%" /Build "${{matrix.type}}|x${{matrix.version}}" /Project "%ocdm%" "%solution%"
128-
&& "%devEnv%" /Build "${{matrix.type}}|x${{matrix.version}}" /Project "%securityagent%" "%solution%"
129-
&& "%devEnv%" /Build "${{matrix.type}}|x${{matrix.version}}" /Project "%virtualinput%" "%solution%"
127+
128+
for %%P in (
129+
"%cryptography%" "%deviceinfo%" "%displayinfo%"
130+
"%ocdm%" "%securityagent%" "%virtualinput%"
131+
) do (
132+
"%devEnv%" /Build "${{matrix.type}}|x${{matrix.version}}" /Project %%P "%solution%"
133+
if errorlevel 1 exit /b 1
134+
)
130135
131136
- name: Tar files
132137
run: tar -czvf ${{matrix.type}}${{matrix.version}}.tar.gz artifacts

0 commit comments

Comments
 (0)