trying without stupid

This commit is contained in:
Daniel Carbone
2023-09-14 17:14:50 -05:00
parent f6b58bacfe
commit 183bc8df0e
3 changed files with 3 additions and 21 deletions

View File

@@ -72,7 +72,7 @@ runs:
}
- name: 'Install jq - Windows-ish non-1.7'
if: runner.os == 'Windows' && (inputs.version == '1.5' || inputs.version == '1.6') && (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
env:
JQ_VERSION: '${{ inputs.version }}'

View File

@@ -56,12 +56,6 @@ Invoke-WebRequest -Uri "${_dl_url}" -OutFile "${_dl_path}"
Write-Host "::endgroup::"
Write-Host "::group::Running choco uninstall jq"
choco uninstall jq
Write-Host "::endgroup::"
# install into tool cache
Write-Host "::group::Copying to tool cache"
@@ -75,9 +69,6 @@ Write-Host "Dst: $Env:RUNNER_TOOL_CACHE\jq\jq.exe"
Move-Item -Force -LiteralPath "$Env:RUNNER_TEMP\${_bin_name}" -Destination "$Env:RUNNER_TOOL_CACHE\jq\jq.exe"
Write-Host "Adding $Env:RUNNER_TOOL_CACHE\jq\ to path..."
$(
"$Env:RUNNER_TOOL_CACHE\jq\"
Get-Content "$Env:GITHUB_PATH" -Raw
) | Set-Content "$Env:GITHUB_PATH"
Add-Content "$Env:GITHUB_PATH" "$Env:RUNNER_TOOL_CACHE\jq\"
Write-Host "::endgroup::"

View File

@@ -40,12 +40,6 @@ Invoke-WebRequest -Uri "${_dl_url}" -OutFile "${_dl_path}"
Write-Host "::endgroup::"
Write-Host "::group::Running choco uninstall jq"
choco uninstall jq
Write-Host "::endgroup::"
# install into tool cache
Write-Host "::group::Copying to tool cache"
@@ -59,9 +53,6 @@ Write-Host "Dst: $Env:RUNNER_TOOL_CACHE\jq\jq.exe"
Move-Item -Force -LiteralPath "$Env:RUNNER_TEMP\${_bin_name}" -Destination "$Env:RUNNER_TOOL_CACHE\jq\jq.exe"
Write-Host "Adding $Env:RUNNER_TOOL_CACHE\jq\ to path..."
$(
"$Env:RUNNER_TOOL_CACHE\jq\"
Get-Content "$Env:GITHUB_PATH" -Raw
) | Set-Content "$Env:GITHUB_PATH"
Add-Content "$Env:GITHUB_PATH" "$Env:RUNNER_TOOL_CACHE\jq\"
Write-Host "::endgroup::"