Skip to content

Commit e2d1765

Browse files
committed
CI: Distclean mswin
Use the given `make-command` instead of the hard-coded `make` command. TODO: Use it for `make up` as well, in the future.
1 parent b563be3 commit e2d1765

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

.github/actions/setup/directories/action.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@ inputs:
1919
Where binaries and other generated contents go. This will be
2020
created if absent.
2121
22+
make-command:
23+
required: false
24+
type: string
25+
default: 'make'
26+
description: >-
27+
The command of `make`.
28+
2229
makeup:
2330
required: false
2431
type: boolean
@@ -169,7 +176,7 @@ runs:
169176
shell: bash
170177
id: clean
171178
run: |
172-
echo distclean='make -C ${{ inputs.builddir }} distclean' >> $GITHUB_OUTPUT
179+
echo distclean='cd ${{ inputs.builddir }} && ${{ inputs.make-command }} distclean' >> $GITHUB_OUTPUT
173180
echo remained-files='find ${{ inputs.builddir }} -ls' >> $GITHUB_OUTPUT
174181
[ "${{ inputs.builddir }}" = "${{ inputs.srcdir }}" ] ||
175182
echo final='rmdir ${{ inputs.builddir }}' >> $GITHUB_OUTPUT

.github/workflows/windows.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ jobs:
7575
with:
7676
srcdir: src
7777
builddir: build
78+
make-command: nmake
79+
clean: true
7880

7981
- name: Install tools with scoop
8082
run: |

0 commit comments

Comments
 (0)