Skip to content

Commit f829191

Browse files
committed
fix relase Windows CI builds
1 parent 584df7c commit f829191

1 file changed

Lines changed: 24 additions & 3 deletions

File tree

.github/workflows/reusable_basic.yml

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,13 +235,15 @@ jobs:
235235
shared_library: 'ON'
236236
level_zero_provider: 'OFF'
237237
cuda_provider: 'OFF'
238+
extra_release_build_type: '-DCMAKE_BUILD_TYPE=Release' # NMake generator requires this
238239
cmake_ver: '3.28.0-windows-x86_64'
239240
# umfd enabled (this job will replace one from matrix)
240241
- os: 'windows-2022'
241242
compiler: {c: cl, cxx: cl}
242243
shared_library: 'ON'
243244
level_zero_provider: 'ON'
244245
cuda_provider: 'ON'
246+
extra_release_build_type: '-DCMAKE_BUILD_TYPE=Release' # NMake generator requires this
245247
umfd_lib: 'ON'
246248
name: Basic (${{matrix.os}},
247249
compilers=${{matrix.compiler.c}}/${{matrix.compiler.cxx}},
@@ -423,12 +425,25 @@ jobs:
423425
424426
- name: check /DEPENDENTLOADFLAG in umf.dll (Release)
425427
if: ${{matrix.shared_library == 'ON' && matrix.compiler.cxx == 'cl'}}
426-
run: ${{github.workspace}}/.github/scripts/check_dll_flags.ps1 ${{env.BUILD_RELEASE_DIR}}/bin/Release/umf.dll
428+
run: |
429+
if (Test-Path "${{env.BUILD_RELEASE_DIR}}/bin/Release/umf.dll") {
430+
$dll_path = "${{env.BUILD_RELEASE_DIR}}/bin/Release/umf.dll"
431+
} else {
432+
$dll_path = "${{env.BUILD_RELEASE_DIR}}/bin/umf.dll"
433+
}
434+
${{github.workspace}}/.github/scripts/check_dll_flags.ps1 $dll_path
427435
shell: pwsh
428436

429437
- name: check /DEPENDENTLOADFLAG in umf_proxy.dll (Release)
430438
if: ${{matrix.shared_library == 'ON' && matrix.compiler.cxx == 'cl'}}
431-
run: ${{github.workspace}}/.github/scripts/check_dll_flags.ps1 ${{env.BUILD_RELEASE_DIR}}/src/proxy_lib/Release/umf_proxy.dll
439+
run: |
440+
Get-ChildItem -Path "${{env.BUILD_RELEASE_DIR}}" -Recurse
441+
if (Test-Path "${{env.BUILD_RELEASE_DIR}}/src/proxy_lib/Release/umf_proxy.dll") {
442+
$dll_path = "${{env.BUILD_RELEASE_DIR}}/src/proxy_lib/Release/umf_proxy.dll"
443+
} else {
444+
$dll_path = "${{env.BUILD_RELEASE_DIR}}/src/proxy_lib/umf_proxy.dll"
445+
}
446+
${{github.workspace}}/.github/scripts/check_dll_flags.ps1 $dll_path
432447
shell: pwsh
433448

434449
- name: Prepare vcpkg cache
@@ -482,7 +497,13 @@ jobs:
482497
# we check umf.dll only here - note that the proxy library is disabled in
483498
# this configuration
484499
- name: check /DEPENDENTLOADFLAG in umf.dll
485-
run: ${{github.workspace}}/.github/scripts/check_dll_flags.ps1 ${{env.BUILD_DIR}}/bin/${{matrix.build_type}}/umf.dll
500+
run: |
501+
if (Test-Path "${{env.BUILD_DIR}}/bin/${{matrix.build_type}}/umf.dll") {
502+
$dll_path = "${{env.BUILD_DIR}}/bin/${{matrix.build_type}}/umf.dll"
503+
} else {
504+
$dll_path = "${{env.BUILD_DIR}}/bin/umf.dll"
505+
}
506+
${{github.workspace}}/.github/scripts/check_dll_flags.ps1 $dll_path
486507
shell: pwsh
487508

488509
windows-static_build_hwloc:

0 commit comments

Comments
 (0)