From 775fe317084bb0d9c4dee7bac9598cbd9a7e2eac Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Mon, 21 Nov 2022 17:25:43 -0500 Subject: [PATCH 1/2] fix: action more native on Windows Signed-off-by: Henry Schreiner --- action.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/action.yml b/action.yml index 31c6b42bc..7aa980976 100644 --- a/action.yml +++ b/action.yml @@ -37,9 +37,23 @@ runs: --python '${{ steps.python.outputs.python-path }}' --spec '${{ github.action_path }}' cibuildwheel - ${{ inputs.package-dir }} - --output-dir ${{ inputs.output-dir }} + "${{ inputs.package-dir }}" + --output-dir "${{ inputs.output-dir }}" --config-file "${{ inputs.config-file }}" --only "${{ inputs.only }}" 2>&1 shell: bash + if: runner.os != 'Windows' + + # Windows needs powershell to interact nicely with Meson + - run: > + pipx run + --python "${{ steps.python.outputs.python-path }}" + --spec "${{ github.action_path }}" + cibuildwheel + "${{ inputs.package-dir }}" + --output-dir "${{ inputs.output-dir }}" + --config-file "${{ inputs.config-file }}" + --only "${{ inputs.only }}" + shell: pwsh + if: runner.os == 'Windows' From 4d7e0491703b332561f58c48d7916d89cdcc600c Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Tue, 22 Nov 2022 08:55:48 -0500 Subject: [PATCH 2/2] fix: powershell on Windows Signed-off-by: Henry Schreiner --- action.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/action.yml b/action.yml index 7aa980976..9ce2e2577 100644 --- a/action.yml +++ b/action.yml @@ -52,8 +52,8 @@ runs: --spec "${{ github.action_path }}" cibuildwheel "${{ inputs.package-dir }}" - --output-dir "${{ inputs.output-dir }}" - --config-file "${{ inputs.config-file }}" - --only "${{ inputs.only }}" + --output-dir '"${{ inputs.output-dir }}"' + --config-file '"${{ inputs.config-file }}"' + --only '"${{ inputs.only }}"' shell: pwsh if: runner.os == 'Windows'