From f73e132b57fc44bbf4d383c162a67776427ecffa Mon Sep 17 00:00:00 2001
From: Umberto Baldi <u.baldi@arduino.cc>
Date: Tue, 31 Oct 2023 15:54:57 +0100
Subject: [PATCH 1/2] switch to gon fork, apple is deprecating altool to sign

---
 .github/workflows/publish-go-nightly-task.yml | 4 ++--
 .github/workflows/release-go-task.yml         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/publish-go-nightly-task.yml b/.github/workflows/publish-go-nightly-task.yml
index c7dd591f2f9..0f5c53bbb70 100644
--- a/.github/workflows/publish-go-nightly-task.yml
+++ b/.github/workflows/publish-go-nightly-task.yml
@@ -117,14 +117,14 @@ jobs:
 
       - name: Install gon for code signing and app notarization
         run: |
-          wget -q https://github.com/mitchellh/gon/releases/download/v0.2.3/gon_macos.zip
+          wget -q https://github.com/Bearer/gon/releases/download/v0.0.27/gon_macos.zip
           unzip gon_macos.zip -d /usr/local/bin
 
       - name: Write gon config to file
         # gon does not allow env variables in config file (https://github.com/mitchellh/gon/issues/20)
         run: |
           cat > "${{ env.GON_CONFIG_PATH }}" <<EOF
-          # See: https://github.com/mitchellh/gon#configuration-file
+          # See: https://github.com/Bearer/gon#configuration-file
           source = ["dist/arduino-cli_osx_${{ matrix.artifact.name }}/arduino-cli"]
           bundle_id = "cc.arduino.arduino-cli"
 
diff --git a/.github/workflows/release-go-task.yml b/.github/workflows/release-go-task.yml
index e6f103de132..9c35bcb2a79 100644
--- a/.github/workflows/release-go-task.yml
+++ b/.github/workflows/release-go-task.yml
@@ -121,14 +121,14 @@ jobs:
 
       - name: Install gon for code signing and app notarization
         run: |
-          wget -q https://github.com/mitchellh/gon/releases/download/v0.2.3/gon_macos.zip
+          wget -q https://github.com/Bearer/gon/releases/download/v0.0.27/gon_macos.zip
           unzip gon_macos.zip -d /usr/local/bin
 
       - name: Write gon config to file
         # gon does not allow env variables in config file (https://github.com/mitchellh/gon/issues/20)
         run: |
           cat > "${{ env.GON_CONFIG_PATH }}" <<EOF
-          # See: https://github.com/mitchellh/gon#configuration-file
+          # See: https://github.com/Bearer/gon#configuration-file
           source = ["dist/arduino-cli_osx_${{ matrix.artifact.name }}/arduino-cli"]
           bundle_id = "cc.arduino.arduino-cli"
 

From cbbd85c7e9b1a28dec019c07122e49581a913376 Mon Sep 17 00:00:00 2001
From: Umberto Baldi <u.baldi@arduino.cc>
Date: Tue, 31 Oct 2023 16:11:19 +0100
Subject: [PATCH 2/2] Provider is mandatory

---
 .github/workflows/publish-go-nightly-task.yml | 1 +
 .github/workflows/release-go-task.yml         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/publish-go-nightly-task.yml b/.github/workflows/publish-go-nightly-task.yml
index 0f5c53bbb70..b814f6fdc2c 100644
--- a/.github/workflows/publish-go-nightly-task.yml
+++ b/.github/workflows/publish-go-nightly-task.yml
@@ -143,6 +143,7 @@ jobs:
         env:
           AC_USERNAME: ${{ secrets.AC_USERNAME }}
           AC_PASSWORD: ${{ secrets.AC_PASSWORD }}
+          AC_PROVIDER: ${{ secrets.AC_PROVIDER }}
         run: |
           gon "${{ env.GON_CONFIG_PATH }}"
 
diff --git a/.github/workflows/release-go-task.yml b/.github/workflows/release-go-task.yml
index 9c35bcb2a79..e67a0865042 100644
--- a/.github/workflows/release-go-task.yml
+++ b/.github/workflows/release-go-task.yml
@@ -147,6 +147,7 @@ jobs:
         env:
           AC_USERNAME: ${{ secrets.AC_USERNAME }}
           AC_PASSWORD: ${{ secrets.AC_PASSWORD }}
+          AC_PROVIDER: ${{ secrets.AC_PROVIDER }}
         run: |
           gon "${{ env.GON_CONFIG_PATH }}"