From 7620ce580a6b7705cd6189ce399a6649a65acd3a Mon Sep 17 00:00:00 2001
From: sebthom <sebthom@users.noreply.github.com>
Date: Fri, 19 Jul 2024 20:49:41 +0200
Subject: [PATCH] fix: "curl: (43) A libcurl function was given a bad argument"

---
 .github/workflows/build.yml |  7 +++---
 README.md                   |  2 +-
 action.yml                  | 48 +++++++++++++++++++++----------------
 3 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 348c71c..290444c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,20 +30,21 @@ jobs:
       matrix:
         os:
         - ubuntu-latest
-        - macos-latest
+        - macos-12     # x64
+        - macos-latest # ARM 
         - windows-latest
 
     steps:
     - name: Git Checkout
       uses: actions/checkout@v4 #https://github.com/actions/checkout
 
-    - name: Install jq '1.5''
+    - name: Install jq '1.5'
       id: install-jq-1_5
       uses: ./
       with:
         version: 1.5
 
-    - name: Test jq '1.5''
+    - name: Test jq '1.5'
       run: |
         set -euxo pipefail
         jq --version
diff --git a/README.md b/README.md
index 3e2c645..e847591 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@
 
 ## <a name="what-is-it"></a>What is it?
 
-**gha-setup-jq** is a GitHub action to install the [jq](https://github.com/stedolan/jq) command-line JSON parser/processor.
+**gha-setup-jq** is a GitHub action to install the [jq](https://github.com/jqlang/jq) command-line JSON parser/processor.
 
 
 ## <a name="github_action"></a>Usage
diff --git a/action.yml b/action.yml
index 2ac74a7..3dc6cdb 100644
--- a/action.yml
+++ b/action.yml
@@ -29,7 +29,7 @@ outputs:
 runs:
   using: 'composite'
   steps:
-  
+
     ##################################################
     # Setup Cache
     ##################################################
@@ -58,11 +58,11 @@ runs:
         function get_installed_version() {
           "${1:-$app_home/$app_target_bin}" --version | cut -d- -f2
         }
-        
+
         INPUTS_VERSION_LOWERCASE="$(tr '[:upper:]' '[:lower:]' <<<"$INPUTS_VERSION")"
-        
+
         if [[ $INPUTS_VERSION_LOWERCASE == 'any' ]] && hash jq &>/dev/null; then
-        
+
           # set outputs
           echo "need_cache_update=false" | tee -a "$GITHUB_OUTPUT"
           case "$RUNNER_OS" in
@@ -70,18 +70,18 @@ runs:
             *)       echo "path=$(which jq)" | tee -a "$GITHUB_OUTPUT" ;;
           esac
           echo "version=$(get_installed_version "$(which jq)")" | tee -a "$GITHUB_OUTPUT"
-        
+
         else
-        
-          APP_REPO_ROOT=https://github.com/stedolan/jq
-        
+
+          APP_REPO_ROOT=https://github.com/jqlang/jq
+
           case "$RUNNER_OS" in
             macOS)
               app_home="$RUNNER_TEMP/jq"
               app_target_bin=jq
               case "$(machine)" in
-                *arm*) echo "ERROR: Unsupported architecture $(machine)"; exit 1 ;;
-                    *) app_source_bin='jq-osx-amd64' ;;
+                *arm*) app_source_bin='jq-macos-arm64' ;;
+                    *) app_source_bin='jq-macos-amd64' ;;
               esac
               ;;
             Linux)
@@ -99,26 +99,32 @@ runs:
               app_source_bin='jq-win64.exe'
               ;;
           esac
-        
+
           echo "app_home: $app_home"
           echo "app_source_bin: $app_source_bin"
           echo "app_target_bin: $app_target_bin"
-        
+
           function get_latest_version() {
-            curl -sSfL --max-time 5 -o /dev/null -w '%{url_effective}' $APP_REPO_ROOT/releases/latest | grep -o '[^/]*$' | cut -d- -f2
+            # temporary workaround for https://github.com/curl/curl/issues/13845
+            if [[ $RUNNER_OS == "Windows" ]]; then
+              (set -x; powershell -Command "(Invoke-WebRequest -Uri '$APP_REPO_ROOT/releases/latest' -Method Head -MaximumRedirection 0 -ErrorAction Ignore -UseBasicParsing).Headers.Location" | grep -o '[^/]*$' | cut -d- -f2)
+              return
+            fi
+
+            (set -x; curl -sSfL --max-time 5 -o /dev/null -w '%{url_effective}' $APP_REPO_ROOT/releases/latest | grep -o '[^/]*$' | cut -d- -f2)
           }
-        
+
           app_downloaded=false
-        
+
           function download_app() {
             app_download_url="$APP_REPO_ROOT/releases/download/jq-$1/$app_source_bin"
             echo "Downloading [$app_download_url]..."
             mkdir -p "$app_home"
-            curl -fsSL --max-time 10 --retry 3 --retry-delay 5 -o "$app_home/$app_target_bin" "$app_download_url"
+            (set -x; curl -fsSL --max-time 10 --retry 3 --retry-delay 5 -o "$app_home/$app_target_bin" "$app_download_url")
             chmod 777 "$app_home/$app_target_bin"
             app_downloaded=true
           }
-        
+
           case "$INPUTS_VERSION_LOWERCASE" in
             any)
               if [[ ! -f "$app_home/$app_target_bin" ]]; then
@@ -146,9 +152,9 @@ runs:
               fi
               ;;
           esac
-        
+
           echo "$RUNNER_TEMP/jq" >> "$GITHUB_PATH"
-        
+
           # prepare cache update
           if [[ $INPUTS_USE_CACHE == 'true' && ${ACT:-} != 'true' ]]; then # $ACT is set when running via nektos/act
             if [[ $app_downloaded == 'true' ]]; then
@@ -163,7 +169,7 @@ runs:
           else
             need_cache_update=false
           fi
-        
+
           # set outputs
           echo "need_cache_update=$need_cache_update" | tee -a "$GITHUB_OUTPUT"
           case "$RUNNER_OS" in
@@ -171,7 +177,7 @@ runs:
             *)       echo "path=$app_home/$app_target_bin" | tee -a "$GITHUB_OUTPUT" ;;
           esac
           echo "version=$(get_installed_version)" | tee -a "$GITHUB_OUTPUT"
-        
+
         fi
         echo '::endgroup::'