Skip to content

Commit 5c86bb8

Browse files
committed
fix CI check for DEPENDENTLOADFLAG
1 parent 5ee9e9e commit 5c86bb8

1 file changed

Lines changed: 21 additions & 3 deletions

File tree

.github/workflows/reusable_basic.yml

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -424,12 +424,24 @@ jobs:
424424
425425
- name: check /DEPENDENTLOADFLAG in umf.dll (Release)
426426
if: ${{matrix.shared_library == 'ON' && matrix.compiler.cxx == 'cl'}}
427-
run: ${{github.workspace}}/.github/scripts/check_dll_flags.ps1 ${{env.BUILD_RELEASE_DIR}}/bin/Release/umf.dll
427+
run: |
428+
if (Test-Path "${{env.BUILD_RELEASE_DIR}}/bin/Release/umf.dll") {
429+
$dll_path = "${{env.BUILD_RELEASE_DIR}}/bin/Release/umf.dll"
430+
} else {
431+
$dll_path = "${{env.BUILD_RELEASE_DIR}}/bin/umf.dll"
432+
}
433+
${{github.workspace}}/.github/scripts/check_dll_flags.ps1 $dll_path
428434
shell: pwsh
429435

430436
- name: check /DEPENDENTLOADFLAG in umf_proxy.dll (Release)
431437
if: ${{matrix.shared_library == 'ON' && matrix.compiler.cxx == 'cl'}}
432-
run: ${{github.workspace}}/.github/scripts/check_dll_flags.ps1 ${{env.BUILD_RELEASE_DIR}}/src/proxy_lib/Release/umf_proxy.dll
438+
run: |
439+
if (Test-Path "${{env.BUILD_RELEASE_DIR}}/src/proxy_lib/Release/umf_proxy.dll") {
440+
$dll_path = "${{env.BUILD_RELEASE_DIR}}/src/proxy_lib/Release/umf_proxy.dll"
441+
} else {
442+
$dll_path = "${{env.BUILD_RELEASE_DIR}}/bin/umf_proxy.dll"
443+
}
444+
${{github.workspace}}/.github/scripts/check_dll_flags.ps1 $dll_path
433445
shell: pwsh
434446

435447
- name: Prepare vcpkg cache
@@ -483,7 +495,13 @@ jobs:
483495
# we check umf.dll only here - note that the proxy library is disabled in
484496
# this configuration
485497
- name: check /DEPENDENTLOADFLAG in umf.dll
486-
run: ${{github.workspace}}/.github/scripts/check_dll_flags.ps1 ${{env.BUILD_DIR}}/bin/${{matrix.build_type}}/umf.dll
498+
run: |
499+
if (Test-Path "${{env.BUILD_DIR}}/bin/${{matrix.build_type}}/umf.dll") {
500+
$dll_path = "${{env.BUILD_DIR}}/bin/${{matrix.build_type}}/umf.dll"
501+
} else {
502+
$dll_path = "${{env.BUILD_DIR}}/bin/umf.dll"
503+
}
504+
${{github.workspace}}/.github/scripts/check_dll_flags.ps1 $dll_path
487505
shell: pwsh
488506

489507
windows-static_build_hwloc:

0 commit comments

Comments
 (0)