From 12f461f79aa1d708e8e64339ce5590bfaef2a3c8 Mon Sep 17 00:00:00 2001
From: Florian Loitsch <florian@toit.io>
Date: Mon, 8 Jul 2024 12:44:27 +0200
Subject: [PATCH] Sign all executables. (#6)

---
 .github/workflows/build_esptool.yml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build_esptool.yml b/.github/workflows/build_esptool.yml
index e08d61340..11290fe13 100644
--- a/.github/workflows/build_esptool.yml
+++ b/.github/workflows/build_esptool.yml
@@ -47,6 +47,10 @@ jobs:
       EFUSE_DIR: ./espefuse/efuse_defs/
 
     steps:
+      - name: Show inputs
+        if: github.event_name == 'workflow_dispatch'
+        run: echo "${{ toJSON(github.event.inputs) }}"
+
       - name: Checkout repository
         uses: actions/checkout@v4
 
@@ -71,11 +75,6 @@ jobs:
           pyinstaller --distpath ./${{ env.DISTPATH }} -F --icon=ci/espressif.ico espsecure.py
           pyinstaller --distpath ./${{ env.DISTPATH }} -F --icon=ci/espressif.ico esp_rfc2217_server.py
 
-      - name: Set executable name
-        id: exe_path
-        run: |
-          echo "EXE_NAME=./${{ env.DISTPATH }}/esptool${{ matrix.EXTEN }}" >> $GITHUB_OUTPUT
-
       - name: Sign Windows binary
         if: (runner.os == 'Windows' && (github.event_name == 'release' || github.event.inputs.sign-windows == 'true'))
         uses: toitlang/action-code-sign@5da128f4fb4f719c1b667867815f6c31e743b111 # v1.1.0
@@ -85,7 +84,7 @@ jobs:
           certificate-password: ${{ secrets.DIGICERT_PASSWORD }}
           certificate-fingerprint: ${{ secrets.DIGICERT_FINGERPRINT }}
           keypair-alias: ${{ vars.DIGICERT_KEYPAIR_ALIAS }}
-          path: ${{ steps.exe_path.outputs.EXE_NAME }}
+          path: ${{ env.DISTPATH }}
 
       - name: Sign macOS binary
         if: (runner.os == 'macOS' && (github.event_name == 'release' || github.event.inputs.sign-macos == 'true'))
@@ -96,7 +95,11 @@ jobs:
           username: ${{ secrets.AC_USERNAME }}
           password: ${{ secrets.AC_PASSWORD }}
           apple-team-id: 33DS2ZRDST
-          app-path: ${{ steps.exe_path.outputs.EXE_NAME }}
+          app-path: |
+            ./${{ env.DISTPATH }}/esptool
+            ./${{ env.DISTPATH }}/espefuse
+            ./${{ env.DISTPATH }}/espsecure
+            ./${{ env.DISTPATH }}/esp_rfc2217_server
 
       - name: Test binaries
         shell: bash