This commit is contained in:
Daniel Carbone
2023-09-14 17:03:31 -05:00
parent ff3e63d085
commit 58f2b9e47b

View File

@@ -68,18 +68,18 @@ runs:
Add-Content $Env:GITHUB_OUTPUT "found=false" Add-Content $Env:GITHUB_OUTPUT "found=false"
} }
- name: 'Install jq - Windows-ish' - name: 'Install jq - Windows-ish non-1.7'
if: runner.os == 'Windows' && (steps.jq-check-windows.outputs.found == 'false' || inputs.force == 'true') if: runner.os == 'Windows' && (inputs.version == '1.5' || inputs.version == '1.6') && (steps.jq-check-windows.outputs.found == 'false' || inputs.force == 'true')
shell: powershell shell: powershell
env: env:
JQ_VERSION: '${{ inputs.version }}' JQ_VERSION: '${{ inputs.version }}'
# language=powershell # language=powershell
run: | run: .\scripts\windowsish.ps1
if ( "${{ inputs.version }}" -eq "1.5" -or "${{ inputs.version }}" -eq "1.6")
{ - name: 'Install jq - Windows-ish 1.7'
'& $Env:GITHUB_ACTION_PATH\scripts\windowsish.ps1' if: runner.os == 'Windows' && inputs.version == '1.7' && (steps.jq-check-windows.outputs.found == 'false' || inputs.force == 'true')
} shell: powershell
else env:
{ JQ_VERSION: '${{ inputs.version }}'
'& $Env:GITHUB_ACTION_PATH\scripts\windowsish-17.ps1' # language=powershell
} run: .\scripts\windowsish-17.ps1