From b7ef57d46ece78760b4019dbc4080a1ba2a40b45 Mon Sep 17 00:00:00 2001
From: Daniel Carbone <daniel.p.carbone@gmail.com>
Date: Wed, 18 Jun 2025 18:11:24 -0500
Subject: [PATCH] Adding 1.8.0 stuff (#20)

---
 .github/workflows/example-linux.yaml   |  2 +-
 .github/workflows/example-macos.yaml   |  2 +-
 .github/workflows/example-windows.yaml |  2 +-
 .github/workflows/tests.yaml           |  2 ++
 README.md                              |  1 +
 action.yaml                            | 12 ++++++------
 scripts/unixish-17.sh                  |  2 +-
 scripts/unixish.sh                     |  2 +-
 8 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/example-linux.yaml b/.github/workflows/example-linux.yaml
index e1e0bc1..b5702f1 100644
--- a/.github/workflows/example-linux.yaml
+++ b/.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
diff --git a/.github/workflows/example-macos.yaml b/.github/workflows/example-macos.yaml
index b709003..55063d2 100644
--- a/.github/workflows/example-macos.yaml
+++ b/.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
diff --git a/.github/workflows/example-windows.yaml b/.github/workflows/example-windows.yaml
index e6d5c91..af0f8f8 100644
--- a/.github/workflows/example-windows.yaml
+++ b/.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
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index a5028dd..3df0457 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -39,6 +39,7 @@ jobs:
         version:
           - '1.7'
           - '1.7.1'
+          - '1.8.0'
         include:
           - image: "ubuntu-latest"
             version: '1.6'
@@ -255,6 +256,7 @@ jobs:
           - '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:
diff --git a/README.md b/README.md
index 19507ad..902fd80 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,7 @@ Multiplatform [jq](https://github.com/stedolan/jq) installer action
 
 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)
diff --git a/action.yaml b/action.yaml
index 0efdcba..866cf2c 100644
--- a/action.yaml
+++ b/action.yaml
@@ -40,7 +40,7 @@ runs:
           echo "found=false" >> $GITHUB_OUTPUT
         fi
 
-    - name: 'Install jq - Unix-ish non-1.7'
+    - 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:
@@ -48,8 +48,8 @@ runs:
       # language=sh
       run: ${GITHUB_ACTION_PATH}/scripts/unixish.sh
 
-    - name: 'Install jq - Unix-ish 1.7'
-      if: (runner.os == 'Linux' || runner.os == 'macOS') && startsWith(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'
+    - 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' && startsWith(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 }}'
diff --git a/scripts/unixish-17.sh b/scripts/unixish-17.sh
index 28b5208..66ebccd 100755
--- a/scripts/unixish-17.sh
+++ b/scripts/unixish-17.sh
@@ -22,7 +22,7 @@ case $RUNNER_OS in
   [Ll]inux)
     _os='linux'
     ;;
-  macOS)
+  mac[Oo][Ss])
     _os='macos'
     ;;
 
diff --git a/scripts/unixish.sh b/scripts/unixish.sh
index 45345ac..804f21e 100755
--- a/scripts/unixish.sh
+++ b/scripts/unixish.sh
@@ -20,7 +20,7 @@ case $RUNNER_OS in
   [Ll]inux)
     _os='linux'
     ;;
-  macOS)
+  mac[Oo][Ss])
     _os='osx'
     ;;