a

Hiroshiba · Oct 3, 2023 · 8a23513 · 8a23513
1 parent 07699ab
commit 8a23513
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -217,16 +217,18 @@ jobs:
         if: startsWith(matrix.os, 'windows-') && github.event.inputs.code_signing == 'true'
         shell: bash
         run: |
-          set -eux
           bash build/codesign_setup.bash
-          echo "WIN_CERTIFICATE_SHA1=$(head -n 1 $THUMBPRINT_PATH)" >> $GITHUB_ENV
+          THUMBPRINT="$(head -n 1 $THUMBPRINT_PATH)"
+          SIGNTOOL_PATH="$(head -n 1 $SIGNTOOL_PATH_PATH)"
+
+          echo "WIN_CERTIFICATE_SHA1=$THUMBPRINT" >> $GITHUB_ENV
           echo 'WIN_SIGNING_HASH_ALGORITHMS=["sha256"]' >> $GITHUB_ENV
-          echo "SIGNTOOL_PATH=$(head -n 1 $SIGNTOOL_PATH_PATH)" >> $GITHUB_ENV
+          echo "SIGNTOOL_PATH=$SIGNTOOL_PATH" >> $GITHUB_ENV
 
           # NOTE: electron-builder 22.14.13 は指定したsigntoolを使わないのでワークアラウンドでディレクトリを差し替える
           CACHE_SIGNTOOL_DIR="$ELECTRON_BUILDER_CACHE/winCodeSign/winCodeSign-2.6.0/windows-10/x64"
           mv "$CACHE_SIGNTOOL_DIR"{,.bak}
-          SIGNTOOL_DIR=$(dirname "$(head -n 1 $SIGNTOOL_PATH_PATH)")
+          SIGNTOOL_DIR=$(dirname "$SIGNTOOL_PATH")
           ln -s "$SIGNTOOL_DIR" "$CACHE_SIGNTOOL_DIR"
         env:
           ESIGNERCKA_USERNAME: ${{ secrets.ESIGNERCKA_USERNAME }}
@@ -676,16 +678,18 @@ jobs:
         if: endsWith(matrix.artifact_name, '-nsis-web') && github.event.inputs.code_signing == 'true'
         shell: bash
         run: |
-          set -eux
           bash build/codesign_setup.bash
-          echo "WIN_CERTIFICATE_SHA1=$(head -n 1 $THUMBPRINT_PATH)" >> $GITHUB_ENV
+          THUMBPRINT="$(head -n 1 $THUMBPRINT_PATH)"
+          SIGNTOOL_PATH="$(head -n 1 $SIGNTOOL_PATH_PATH)"
+
+          echo "WIN_CERTIFICATE_SHA1=$THUMBPRINT" >> $GITHUB_ENV
           echo 'WIN_SIGNING_HASH_ALGORITHMS=["sha256"]' >> $GITHUB_ENV
-          echo "SIGNTOOL_PATH=$(head -n 1 $SIGNTOOL_PATH_PATH)" >> $GITHUB_ENV
+          echo "SIGNTOOL_PATH=$SIGNTOOL_PATH" >> $GITHUB_ENV
 
           # NOTE: electron-builder 22.14.13 は指定したsigntoolを使わないのでワークアラウンドでディレクトリを差し替える
           CACHE_SIGNTOOL_DIR="$ELECTRON_BUILDER_CACHE/winCodeSign/winCodeSign-2.6.0/windows-10/x64"
           mv "$CACHE_SIGNTOOL_DIR"{,.bak}
-          SIGNTOOL_DIR=$(dirname "$(head -n 1 $SIGNTOOL_PATH_PATH)")
+          SIGNTOOL_DIR=$(dirname "$SIGNTOOL_PATH")
           ln -s "$SIGNTOOL_DIR" "$CACHE_SIGNTOOL_DIR"
         env:
           ESIGNERCKA_USERNAME: ${{ secrets.ESIGNERCKA_USERNAME }}