From 4e6d52de309a4c46bb056c80e038ddb2717d8195 Mon Sep 17 00:00:00 2001 From: Daniel Carbone Date: Sat, 29 Mar 2025 22:36:49 -0500 Subject: [PATCH] bumping default to jq 1.7.1 (#16) * bumping default to jq 1.7.1 --- .github/workflows/tests.yaml | 2 ++ action.yaml | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index dd38ef3..0fd922a 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -39,6 +39,7 @@ jobs: - 'false' version: - '1.7' + - '1.7.1' include: - image: "ubuntu-latest" version: '1.6' @@ -277,6 +278,7 @@ jobs: - '1.5' - '1.6' - '1.7' + - '1.7.1' name: "Test Action (Container) - (img: ${{ matrix.image }}; version: ${{ matrix.version }}; force: ${{ matrix.force }})" runs-on: ${{ matrix.image }} container: diff --git a/action.yaml b/action.yaml index 906ec0b..c70eb23 100644 --- a/action.yaml +++ b/action.yaml @@ -9,8 +9,8 @@ branding: inputs: version: required: false - description: "Version of jq to install" - default: "1.7" + description: "Version of jq to install." + default: "1.7.1" force: required: false description: "If 'true', does not check for existing jq installation before continuing." @@ -41,7 +41,7 @@ runs: fi - name: 'Install jq - Unix-ish non-1.7' - 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') + if: (runner.os == 'Linux' || runner.os == 'macOS') && (startsWith(inputs.version, '1.5') || startsWith(inputs.version, '1.6')) && (steps.jq-check-unix.outputs.found == 'false' || inputs.force == 'true') shell: sh env: JQ_VERSION: '${{ inputs.version }}' @@ -49,7 +49,7 @@ runs: run: ${GITHUB_ACTION_PATH}/scripts/unixish.sh - name: 'Install jq - Unix-ish 1.7' - if: (runner.os == 'Linux' || runner.os == 'macOS') && inputs.version == '1.7' && (steps.jq-check-unix.outputs.found == 'false' || inputs.force == 'true') + if: (runner.os == 'Linux' || runner.os == 'macOS') && startsWith(inputs.version, '1.7') && (steps.jq-check-unix.outputs.found == 'false' || inputs.force == 'true') shell: sh env: JQ_VERSION: '${{ inputs.version }}'