love windows.

This commit is contained in:
Daniel Carbone
2023-09-14 17:11:06 -05:00
parent d6095dd111
commit 4fd1c2fa17
2 changed files with 14 additions and 11 deletions

View File

@@ -40,18 +40,21 @@ runs:
echo "found=false" >> $GITHUB_OUTPUT echo "found=false" >> $GITHUB_OUTPUT
fi fi
- name: 'Install jq - Unix-ish' - name: 'Install jq - Unix-ish non-1.7'
if: (runner.os == 'Linux' || runner.os == 'macOS') && (steps.jq-check-unix.outputs.found == 'false' || inputs.force == 'true') if: (runner.os == 'Linux' || runner.os == 'macOS') && (inputs.version == '1.5' || inputs.version == '1.6') (steps.jq-check-unix.outputs.found == 'false' || inputs.force == 'true')
shell: bash shell: bash
env: env:
JQ_VERSION: '${{ inputs.version }}' JQ_VERSION: '${{ inputs.version }}'
# language=sh # language=sh
run: | run: ${{ github.action_path }/scripts/unixish.sh
if [[ '${{ inputs.version }}' == '1.5' ]] || [[ '${{ inputs.version }}' == '1.6' ]]; then
$GITHUB_ACTION_PATH/scripts/unixish.sh - name: 'Install jq - Unix-ish 1.7'
else if: (runner.os == 'Linux' || runner.os == 'macOS') && inputs.version == '1.7' (steps.jq-check-unix.outputs.found == 'false' || inputs.force == 'true')
$GITHUB_ACTION_PATH/scripts/unixish-17.sh shell: bash
fi env:
JQ_VERSION: '${{ inputs.version }}'
# language=sh
run: ${{ github.action_path }/scripts/unixish-17.sh
- name: 'Check for jq - Windows-ish' - name: 'Check for jq - Windows-ish'
id: jq-check-windows id: jq-check-windows
@@ -74,7 +77,7 @@ runs:
env: env:
JQ_VERSION: '${{ inputs.version }}' JQ_VERSION: '${{ inputs.version }}'
# language=powershell # language=powershell
run: .\scripts\windowsish.ps1 run: ${{ github.action_path }\scripts\windowsish.ps1
- name: 'Install jq - Windows-ish 1.7' - name: 'Install jq - Windows-ish 1.7'
if: runner.os == 'Windows' && inputs.version == '1.7' && (steps.jq-check-windows.outputs.found == 'false' || inputs.force == 'true') if: runner.os == 'Windows' && inputs.version == '1.7' && (steps.jq-check-windows.outputs.found == 'false' || inputs.force == 'true')
@@ -82,4 +85,4 @@ runs:
env: env:
JQ_VERSION: '${{ inputs.version }}' JQ_VERSION: '${{ inputs.version }}'
# language=powershell # language=powershell
run: .\scripts\windowsish-17.ps1 run: ${{ github.action_path }\scripts\windowsish-17.ps1

View File

@@ -34,7 +34,7 @@ switch ($_arch_env)
} }
# build bin name # build bin name
$_bin_name = "jq-windows-${_arch}" $_bin_name = "jq-windows-${_arch}.exe"
# build download vars # build download vars