Skip to content

Commit

Permalink
Do not install/setup DMC when not using DMD
Browse files Browse the repository at this point in the history
Otherwise the wrong linker is being used.
  • Loading branch information
Geod24 committed Dec 5, 2023
1 parent 9d15f94 commit f7ec406
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 #
Expand Down

0 comments on commit f7ec406

Please sign in to comment.