Adding 1.8.0 stuff (#20)

* 171 for windows and some small cleanup

* startWith -> startsWith

.github/workflows/example-linux.yaml

@@ -7,7 +7,7 @@ on:
         type: string
         required: false
         description: 'Version of jq to install'
-        default: '1.7'
+        default: '1.7.1'
       force:
         type: boolean
         required: false

.github/workflows/example-macos.yaml

@@ -7,7 +7,7 @@ on:
         type: string
         required: false
         description: 'Version of jq to install'
-        default: '1.7'
+        default: '1.7.1'
       force:
         type: boolean
         required: false

.github/workflows/example-windows.yaml

@@ -7,7 +7,7 @@ on:
         type: string
         required: false
         description: 'Version of jq to install'
-        default: '1.7'
+        default: '1.7.1'
       force:
         type: boolean
         required: false

.github/workflows/tests.yaml

@@ -24,7 +24,6 @@ jobs:
       matrix:
         image:
           - "ubuntu-latest"
-          - "ubuntu-20.04"
           - "ubuntu-22.04"
           - "ubuntu-24.04"
           - "macos-latest"
@@ -39,6 +38,8 @@ jobs:
           - 'false'
         version:
           - '1.7'
+          - '1.7.1'
+          - '1.8.0'
         include:
           - image: "ubuntu-latest"
             version: '1.6'
@@ -53,19 +54,6 @@ jobs:
             version: '1.5'
             force: false
 
-          - image: "ubuntu-20.04"
-            version: '1.6'
-            force: true
-          - image: "ubuntu-20.04"
-            version: '1.6'
-            force: false
-          - image: "ubuntu-20.04"
-            version: '1.5'
-            force: true
-          - image: "ubuntu-20.04"
-            version: '1.5'
-            force: false
-
           - image: "ubuntu-22.04"
             version: '1.6'
             force: true
@@ -168,15 +156,13 @@ jobs:
         if: runner.os == 'Linux' || runner.os == 'macOS'
         # language=sh
         run: |
-          _installed='${{ steps.install-jq.outputs.installed }}'
-          _err=
           if [[ '${{ matrix.force }}' == 'true' ]]; then
             # enabling "force" must result in an install
             if [[ '${{ steps.install-jq.outputs.installed }}' != 'true' ]]; then
               echo 'Unexpected value for "installed":'
               echo 'Expected:   "true"'
               echo 'Actual:     "${{ steps.install-jq.outputs.installed }}"'
-              _err=1
+              exit 1
             fi
           else
             if [[ '${{ steps.install-jq.outputs.found }}' == 'true' ]]; then
@@ -185,7 +171,7 @@ jobs:
                 echo 'Unexpected value for "installed":'
                 echo 'Expected:   "false"'
                 echo 'Actual:     "${{ steps.install-jq.outputs.installed }}"'
-                _err=1
+                exit 1
               fi
             else
               # if not found, must be installed
@@ -193,12 +179,10 @@ jobs:
                 echo 'Unexpected value for "installed":'
                 echo 'Expected:   "true"'
                 echo 'Actual:     "${{ steps.install-jq.outputs.installed }}"'
-                _err=1
+                exit 1
               fi
             fi
           fi
-          if [ -n "${_err}" ]; then exit 1; fi;
-          
 
       - name: Check jq - Windows-ish
         if: runner.os == 'Windows' && matrix.force == 'true'
@@ -223,7 +207,6 @@ jobs:
           $ErrorActionPreference = 'Stop'
           Set-StrictMode -Version Latest
           $_installed='${{ steps.install-jq.outputs.installed }}'
-          $_err = 0
           if ("${{ matrix.force }}" -eq "true")
           {
               # enabling "force" must result in an install
@@ -232,7 +215,7 @@ jobs:
                   Write-Host "Unexpected value for installed"
                   Write-Host "Expected:   true"
                   Write-Host "Actual:     ${{ steps.install-jq.outputs.installed }}"
-                  $_err=1
+                  exit 1
               }
           }
           else
@@ -245,7 +228,7 @@ jobs:
                       Write-Host "Unexpected value for installed"
                       Write-Host "Expected:  false"
                       Write-Host "Actual:    ${{ steps.install-jq.outputs.installed }}"
-                      $_err=1
+                      exit 1
                   }
               }
               else
@@ -255,21 +238,16 @@ jobs:
                       Write-Host "Unexpected value for installed"
                       Write-Host "Expected:  true"
                       Write-Host "Actual:    ${{ steps.install-jq.outputs.installed }}"
-                      $_err=1
+                      exit 1
                   }
               }
           }
-          if ("${_err}" -ne 0)
-          {
-              exit 1
-          }
   test-container:
     strategy:
       matrix:
         image:
           - "ubuntu-24.04"
           - "ubuntu-22.04"
-          - "ubuntu-20.04"
         force:
           - 'true'
           - 'false'
@@ -277,6 +255,8 @@ jobs:
           - '1.5'
           - '1.6'
           - '1.7'
+          - '1.7.1'
+          - '1.8.0'
     name: "Test Action (Container) - (img: ${{ matrix.image }}; version: ${{ matrix.version }}; force: ${{ matrix.force }})"
     runs-on: ${{ matrix.image }}
     container:
@@ -294,35 +274,31 @@ jobs:
       - name: Check jq
         # language=sh
         run: |
-          _err=
           _which="$(which jq)"
           _vers="$(jq --version)"
           if [[ "${_which}" != "$RUNNER_TOOL_CACHE/jq/jq" ]]; then
             echo "jq found at unexpected path."
             echo "  Expected:   \"$RUNNER_TOOL_CACHE/jq/jq\""
             echo "  Actual:     \"${_which}\""
-            _err=1
+            exit 1
           fi
           if [[ "${_vers}" != 'jq-${{ matrix.version }}' ]]; then
             echo "jq --version returned unexpected value"
             echo '  Expected:   "jq-${{ matrix.version }}"'
             echo "  Actual:     \"${_vers}\""
-            _err=1
+            exit 1
           fi
-          if [ -n "${_err}" ]; then exit 1; fi;
 
       - name: Check Outputs
         # language=sh
         run: |
-          _installed='${{ steps.install-jq.outputs.installed }}'
-          _err=
           if [[ '${{ matrix.force }}' == 'true' ]]; then
             # enabling "force" must result in an install
             if [[ '${{ steps.install-jq.outputs.installed }}' != 'true' ]]; then
               echo 'Unexpected value for "installed":'
               echo 'Expected:   "true"'
               echo 'Actual:     "${{ steps.install-jq.outputs.installed }}"'
-              _err=1
+              exit 1
             fi
           else
             if [[ '${{ steps.install-jq.outputs.found }}' == 'true' ]]; then
@@ -331,7 +307,7 @@ jobs:
                 echo 'Unexpected value for "installed":'
                 echo 'Expected:   "false"'
                 echo 'Actual:     "${{ steps.install-jq.outputs.installed }}"'
-                _err=1
+                exit 1
               fi
             else
               # if not found, must be installed
@@ -339,8 +315,7 @@ jobs:
                 echo 'Unexpected value for "installed":'
                 echo 'Expected:   "true"'
                 echo 'Actual:     "${{ steps.install-jq.outputs.installed }}"'
-                _err=1
+                exit 1
               fi
             fi
           fi
-          if [ -n "${_err}" ]; then exit 1; fi;

README.md

@@ -1,10 +1,12 @@
 # install-jq-action
 Multiplatform [jq](https://github.com/stedolan/jq) installer action
 
-[![Tests - Setup jq Action](https://github.com/dcarbone/install-jq-action/actions/workflows/tests.yaml/badge.svg)](https://github.com/dcarbone/install-jq-action/actions/workflows/tests.yaml)
+[![Tests - Install jq Action](https://github.com/dcarbone/install-jq-action/actions/workflows/tests.yaml/badge.svg)](https://github.com/dcarbone/install-jq-action/actions/workflows/tests.yaml)
 
 This action is tested against the following versions of JQ:
 
+- [1.8.0](https://github.com/jqlang/jq/releases/tag/jq-1.8.0)
+- [1.7.1](https://github.com/jqlang/jq/releases/tag/jq-1.7.1)
 - [1.7](https://github.com/jqlang/jq/releases/tag/jq-1.7)
 - [1.6](https://github.com/jqlang/jq/releases/tag/jq-1.6)
 - [1.5](https://github.com/jqlang/jq/releases/tag/jq-1.5)
@@ -29,7 +31,7 @@ This action is tested against the following versions of JQ:
   version:
     required: false
     description: "Version of jq to install"
-    default: "1.7"
+    default: "1.7.1"
 ```
 
 This must be a version with a [corresponding release](https://github.com/stedolan/jq/releases).

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."
@@ -40,16 +40,16 @@ runs:
           echo "found=false" >> $GITHUB_OUTPUT
         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')
+    - name: 'Install jq - Unix-ish sub-1.7'
+      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 }}'
       # language=sh
       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')
+    - name: 'Install jq - Unix-ish 1.7+'
+      if: (runner.os == 'Linux' || runner.os == 'macOS') && (startsWith(inputs.version, '1.7') || startsWith(inputs.version, '1.8')) && (steps.jq-check-unix.outputs.found == 'false' || inputs.force == 'true')
       shell: sh
       env:
         JQ_VERSION: '${{ inputs.version }}'
@@ -71,15 +71,15 @@ runs:
             Add-Content $Env:GITHUB_OUTPUT "found=false"
         }
 
-    - 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')
+    - name: 'Install jq - Windows-ish sub-1.7'
+      if: runner.os == 'Windows' && (startsWith(inputs.version, '1.5') || startsWith(inputs.version, '1.6')) && (steps.jq-check-windows.outputs.found == 'false' || inputs.force == 'true')
       shell: powershell
       env:
         JQ_VERSION: '${{ inputs.version }}'
       run: ${{ github.action_path }}\scripts\windowsish.ps1
 
-    - 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')
+    - name: 'Install jq - Windows-ish 1.7+'
+      if: runner.os == 'Windows' && (startsWith(inputs.version, '1.7') || startsWith(inputs.version, '1.8')) && (steps.jq-check-windows.outputs.found == 'false' || inputs.force == 'true')
       shell: powershell
       env:
         JQ_VERSION: '${{ inputs.version }}'

scripts/unixish-17.sh

@@ -19,10 +19,10 @@ _dl_path=
 _dl_url=
 
 case $RUNNER_OS in
-  Linux)
+  [Ll]inux)
     _os='linux'
     ;;
-  macOS)
+  mac[Oo][Ss])
     _os='macos'
     ;;
 

scripts/unixish.sh

@@ -17,10 +17,10 @@ _dl_path=
 _dl_url=
 
 case $RUNNER_OS in
-  Linux)
+  [Ll]inux)
     _os='linux'
     ;;
-  macOS)
+  mac[Oo][Ss])
     _os='osx'
     ;;