mirrors/dmd
1
0
Fork 0
mirror of https://github.com/dlang/dmd.git synced 2025-04-26 05:00:16 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

GitHub Actions: Fix up C++ interop tests job on Windows

Browse source
This commit is contained in:
Martin Kinkelin 2023-12-15 02:43:24 +01:00 • committed by Nicholas Wilson
parent 8ba900bbf2
commit 49b71b95b9
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
.github/workflows/runnable_cxx.yml vendored
View file

@ -312,6 +312,7 @@ jobs:
run: | run: |
echo "VISUAL_STUDIO_LIB_NOT_DM=$(which lib.exe)" >> $GITHUB_ENV echo "VISUAL_STUDIO_LIB_NOT_DM=$(which lib.exe)" >> $GITHUB_ENV
echo "HOST_DMD=${{ env.DC }}" >> $GITHUB_ENV echo "HOST_DMD=${{ env.DC }}" >> $GITHUB_ENV
echo "GNU_MAKE=$(which make.exe)" >> $GITHUB_ENV
echo "${{ github.workspace }}/tools/dm/bin/" >> $GITHUB_PATH echo "${{ github.workspace }}/tools/dm/bin/" >> $GITHUB_PATH
######################################## ########################################
@ -343,11 +344,10 @@ jobs:
# Note: Only CC for druntime and AR for Phobos are required ATM, # Note: Only CC for druntime and AR for Phobos are required ATM,
# but providing all three to avoid surprise for future contributors # but providing all three to avoid surprise for future contributors
# Those should really be in the path, though. # Those should really be in the path, though.
cd dmd/druntime "$GNU_MAKE" -j2 -C dmd/druntime
make -f win64.mak
if [ $? -ne 0 ]; then return 1; fi if [ $? -ne 0 ]; then return 1; fi
cd ../../phobos/ cd phobos/
make -f win64.mak CC=cl.exe LD=link "AR=$VISUAL_STUDIO_LIB_NOT_DM" make -f win64.mak CC=cl.exe LD=link "AR=$VISUAL_STUDIO_LIB_NOT_DM" "DRUNTIMELIB=../dmd/generated/windows/release/64/druntime.lib"
if [ $? -ne 0 ]; then return 1; fi if [ $? -ne 0 ]; then return 1; fi
cd ../ cd ../
@ -370,8 +370,7 @@ jobs:
if: runner.os == 'Windows' if: runner.os == 'Windows'
shell: bash shell: bash
run: | run: |
cd dmd/druntime "$GNU_MAKE" -j2 -C dmd/druntime test/stdcpp/.run CC=cl.exe LD=link "AR=$VISUAL_STUDIO_LIB_NOT_DM"
make -f win64.mak test_stdcpp CC=cl.exe LD=link "AR=$VISUAL_STUDIO_LIB_NOT_DM"
if [ $? -ne 0 ]; then return 1; fi if [ $? -ne 0 ]; then return 1; fi
######################################## ########################################