Skip to content

Commit 33695da

Browse files
authored
Update msbuild.yml
1 parent e7d245f commit 33695da

File tree

1 file changed

+49
-75
lines changed

1 file changed

+49
-75
lines changed

Diff for: .github/workflows/msbuild.yml

+49-75
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,10 @@ jobs:
172172
${{env.SOLUTION_FILE_PATH}}\build\**\*.pdb
173173
if-no-files-found: error
174174

175-
testing-debug:
176-
name: Testing Debug
177-
runs-on: self-hosted
178-
needs: [ building-debug-x86, building-debug-x86-64 ]
175+
testing-debug-x86:
176+
name: Testing Debug (x86)
177+
runs-on: windows-latest
178+
needs: building-debug-x86
179179

180180
steps:
181181
- name: Downloading Debug (x86)
@@ -185,37 +185,31 @@ jobs:
185185
path: |
186186
${{env.SOLUTION_FILE_PATH}}\build
187187
188+
- name: Testing Debug (x86)
189+
working-directory: ${{env.GITHUB_WORKSPACE}}
190+
run: ${{env.SOLUTION_FILE_PATH}}\build\x86\Debug\Detours.exe
191+
192+
testing-debug-x86-64:
193+
name: Testing Debug (x86_64)
194+
runs-on: windows-latest
195+
needs: building-debug-x86-64
196+
197+
steps:
188198
- name: Downloading Debug (x86_64)
189199
uses: actions/download-artifact@v4
190200
with:
191201
name: BuildDebug64
192202
path: |
193203
${{env.SOLUTION_FILE_PATH}}\build
194204
195-
- name: Testing Debug (x86)
196-
if: always()
197-
timeout-minutes: 3
198-
working-directory: ${{env.GITHUB_WORKSPACE}}
199-
run: python "C:\DeleakerConsole.py" --export-xml-report-on-exit "${{env.SOLUTION_FILE_PATH}}\build\x86\Debug\report.xml" --run "${{env.SOLUTION_FILE_PATH}}\build\x86\Debug\Detours.exe"
200-
201205
- name: Testing Debug (x86_64)
202-
if: always()
203-
timeout-minutes: 3
204206
working-directory: ${{env.GITHUB_WORKSPACE}}
205-
run: python "C:\DeleakerConsole.py" --export-xml-report-on-exit "${{env.SOLUTION_FILE_PATH}}\build\x86_64\Debug\report.xml" --run "${{env.SOLUTION_FILE_PATH}}\build\x86_64\Debug\Detours.exe"
207+
run: ${{env.SOLUTION_FILE_PATH}}\build\x86_64\Debug\Detours.exe
206208

207-
- name: Uploading results
208-
uses: actions/upload-artifact@v4
209-
with:
210-
name: DebugTesting
211-
path: |
212-
${{env.SOLUTION_FILE_PATH}}\build\**\*.xml
213-
if-no-files-found: error
214-
215-
testing-release:
216-
name: Testing Release
217-
runs-on: self-hosted
218-
needs: [ testing-debug, building-release-x86, building-release-x86-64 ]
209+
testing-release-x86:
210+
name: Testing Release (x86)
211+
runs-on: windows-latest
212+
needs: building-release-x86
219213

220214
steps:
221215
- name: Downloading Release (x86)
@@ -224,38 +218,32 @@ jobs:
224218
name: BuildRelease32
225219
path: |
226220
${{env.SOLUTION_FILE_PATH}}\build
227-
221+
222+
- name: Testing Release (x86)
223+
working-directory: ${{env.GITHUB_WORKSPACE}}
224+
run: ${{env.SOLUTION_FILE_PATH}}\build\x86\Debug\Detours.exe
225+
226+
testing-release-x86-64:
227+
name: Testing Release (x86_64)
228+
runs-on: windows-latest
229+
needs: building-release-x86-64
230+
231+
steps:
228232
- name: Downloading Release (x86_64)
229233
uses: actions/download-artifact@v4
230234
with:
231235
name: BuildRelease64
232236
path: |
233237
${{env.SOLUTION_FILE_PATH}}\build
234238
235-
- name: Testing Release (x86)
236-
if: always()
237-
timeout-minutes: 3
238-
working-directory: ${{env.GITHUB_WORKSPACE}}
239-
run: ${{env.SOLUTION_FILE_PATH}}\build\x86\Release\Detours.exe
240-
241239
- name: Testing Release (x86_64)
242-
if: always()
243-
timeout-minutes: 3
244240
working-directory: ${{env.GITHUB_WORKSPACE}}
245-
run: ${{env.SOLUTION_FILE_PATH}}\build\x86_64\Release\Detours.exe
246-
247-
- name: Uploading results
248-
uses: actions/upload-artifact@v4
249-
with:
250-
name: ReleaseTesting
251-
path: |
252-
${{env.SOLUTION_FILE_PATH}}\build\**\*.xml
253-
if-no-files-found: error
241+
run: ${{env.SOLUTION_FILE_PATH}}\build\x86_64\Debug\Detours.exe
254242

255-
checking-debug:
256-
name: Checking Debug
243+
checking:
244+
name: Checking
257245
runs-on: self-hosted
258-
needs: testing-debug
246+
needs: [ testing-debug-x86, testing-debug-x86-64, testing-release-x86, testing-release-x86-64 ]
259247

260248
steps:
261249
- name: Downloading Debug (x86)
@@ -272,46 +260,32 @@ jobs:
272260
path: |
273261
${{env.SOLUTION_FILE_PATH}}\build
274262
275-
- name: Checking Debug (x86)
276-
if: always()
277-
timeout-minutes: 3
278-
working-directory: ${{env.GITHUB_WORKSPACE}}
279-
run: python "C:\DeleakerConsole.py" --export-xml-report-on-exit "${{env.SOLUTION_FILE_PATH}}\build\x86\Debug\report.xml" --run "${{env.SOLUTION_FILE_PATH}}\build\x86\Debug\Detours.exe"
280-
281-
- name: Checking Debug (x86_64)
282-
if: always()
283-
timeout-minutes: 3
284-
working-directory: ${{env.GITHUB_WORKSPACE}}
285-
run: python "C:\DeleakerConsole.py" --export-xml-report-on-exit "${{env.SOLUTION_FILE_PATH}}\build\x86_64\Debug\report.xml" --run "${{env.SOLUTION_FILE_PATH}}\build\x86_64\Debug\Detours.exe"
286-
287-
- name: Uploading results
288-
uses: actions/upload-artifact@v4
289-
with:
290-
name: DebugChecking
291-
path: |
292-
${{env.SOLUTION_FILE_PATH}}\build\**\*.xml
293-
if-no-files-found: error
294-
295-
checking-release:
296-
name: Checking Release
297-
runs-on: self-hosted
298-
needs: [ checking-debug, testing-release ]
299-
300-
steps:
301263
- name: Downloading Release (x86)
302264
uses: actions/download-artifact@v4
303265
with:
304266
name: BuildRelease32
305267
path: |
306268
${{env.SOLUTION_FILE_PATH}}\build
307-
269+
308270
- name: Downloading Release (x86_64)
309271
uses: actions/download-artifact@v4
310272
with:
311273
name: BuildRelease64
312274
path: |
313275
${{env.SOLUTION_FILE_PATH}}\build
314276
277+
- name: Checking Debug (x86)
278+
if: always()
279+
timeout-minutes: 3
280+
working-directory: ${{env.GITHUB_WORKSPACE}}
281+
run: python "C:\DeleakerConsole.py" --export-xml-report-on-exit "${{env.SOLUTION_FILE_PATH}}\build\x86\Debug\report.xml" --run "${{env.SOLUTION_FILE_PATH}}\build\x86\Debug\Detours.exe"
282+
283+
- name: Checking Debug (x86_64)
284+
if: always()
285+
timeout-minutes: 3
286+
working-directory: ${{env.GITHUB_WORKSPACE}}
287+
run: python "C:\DeleakerConsole.py" --export-xml-report-on-exit "${{env.SOLUTION_FILE_PATH}}\build\x86_64\Debug\report.xml" --run "${{env.SOLUTION_FILE_PATH}}\build\x86_64\Debug\Detours.exe"
288+
315289
- name: Checking Release (x86)
316290
if: always()
317291
timeout-minutes: 3
@@ -327,15 +301,15 @@ jobs:
327301
- name: Uploading results
328302
uses: actions/upload-artifact@v4
329303
with:
330-
name: ReleaseChecking
304+
name: DebugChecking
331305
path: |
332306
${{env.SOLUTION_FILE_PATH}}\build\**\*.xml
333307
if-no-files-found: error
334308

335309
signing:
336310
name: Signing Release
337311
runs-on: self-hosted
338-
needs: checking-release
312+
needs: checking
339313

340314
steps:
341315
- name: Downloading Release (x86)

0 commit comments

Comments
 (0)