From 57c2512bfa5d3f51c08960108e732224ef465d51 Mon Sep 17 00:00:00 2001 From: Mathias Lang Date: Tue, 5 Dec 2023 20:50:11 +0100 Subject: [PATCH] Do not install/setup DMC when not using DMD Otherwise the wrong linker is being used. --- .github/workflows/e2e.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index bf91699..99670ea 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -161,14 +161,14 @@ jobs: # Restore or install dmc (and DM make) - name: '[Windows] Restore dmc from cache' id: cache-dmc - if: runner.os == 'Windows' + if: runner.os == 'Windows' && startsWith(matrix.dc, "dmd") uses: actions/cache@v3 with: path: ${{ github.workspace }}\tools\ key: ${{ matrix.os.name }}-dmc857 - name: '[Windows] Install dmc' - if: runner.os == 'Windows' && steps.cache-dmc.outputs.cache-hit != 'true' + if: runner.os == 'Windows' && startsWith(matrix.dc, "dmd") && steps.cache-dmc.outputs.cache-hit != 'true' shell: powershell run: | $url = "http://ftp.digitalmars.com/Digital_Mars_C++/Patch/dm857c.zip" @@ -193,7 +193,9 @@ jobs: run: | echo "VISUAL_STUDIO_LIB_NOT_DM=$(which lib.exe)" >> $GITHUB_ENV echo "HOST_DMD=${{ env.DC }}" >> $GITHUB_ENV - echo "${{ github.workspace }}/tools/dm/bin/" >> $GITHUB_PATH + if [ ${{ startsWith(matrix.dc, "dmd") }} ]; then + echo "${{ github.workspace }}/tools/dm/bin/" >> $GITHUB_PATH + fi ######################################## # Running the test suite #