Skip to content

Commit 94368a3

Browse files
committed
use variable not install new make on Windows
1 parent 76373be commit 94368a3

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

github-actions/ci-dist/action.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -300,11 +300,14 @@ runs:
300300
else
301301
echo "No file Makefile.PL or Build.PL" >&2
302302
fi
303-
- name: GNU make for Windows
303+
- name: set MYMAKE (Windows)
304304
shell: bash
305-
if: matrix.os == 'windows-latest'
306-
run: |
307-
choco install --verbose make
305+
if: runner.os == 'Windows'
306+
run: echo MYMAKE=gmake >> $GITHUB_ENV
307+
- name: set MYMAKE (non-Windows)
308+
shell: bash
309+
if: runner.os != 'Windows'
310+
run: echo MYMAKE=make >> $GITHUB_ENV
308311
- name: target-test (no coverage)
309312
shell: bash
310313
if: ${{ fromJSON(inputs.target-all) || fromJSON(inputs.target-test) && !fromJSON(inputs.test-enable-coverage) }}
@@ -314,7 +317,7 @@ runs:
314317
run: |
315318
cd ${{ inputs.path }}
316319
if [ -f Makefile.PL ]; then
317-
( $TEST_RUNNER_PREFIX make && $TEST_RUNNER_PREFIX make test ) || exit 1
320+
( $TEST_RUNNER_PREFIX $MYMAKE && $TEST_RUNNER_PREFIX $MYMAKE test ) || exit 1
318321
elif [ -f Build.PL ]; then
319322
( $TEST_RUNNER_PREFIX $MYPERL Build test ) || exit 1
320323
else

0 commit comments

Comments
 (0)