ワークアラウンド

Hiroshiba · Oct 3, 2023 · 5d28c7b · 5d28c7b
1 parent ffae0c6
commit 5d28c7b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/.env.production b/.env.production
@@ -10,4 +10,3 @@ DEFAULT_ENGINE_INFOS=`[
 ]`
 VUE_APP_GTM_CONTAINER_ID=GTM-DUMMY
 VV_OUTPUT_LOG_UTF8=1
-SIGNTOOL_PATH="C:/Program Files (x86)/Windows Kits/10/bin/10.0.22621.0/x86/signtool.exe"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -221,6 +221,11 @@ jobs:
           echo "WIN_CERTIFICATE_SHA1=$(head -n 1 $THUMBPRINT_PATH)" >> $GITHUB_ENV
           echo 'WIN_SIGNING_HASH_ALGORITHMS=["sha256"]' >> $GITHUB_ENV
           echo "SIGNTOOL_PATH=$(head -n 1 $SIGNTOOL_PATH_PATH)" >> $GITHUB_ENV
+
+          # NOTE: electron-builder 22.14.13 は指定したsigntoolを使わないのでワークアラウンド
+          CACHE_SIGNTOOL_PATH=$ELECTRON_BUILDER_CACHE/winCodeSign/winCodeSign-2.6.0/windows-10/x64/signtool.exe
+          mv $CACHE_SIGNTOOL_PATH{,.bak}
+          cp $SIGNTOOL_PATH $CACHE_SIGNTOOL_PATH
         env:
           ESIGNERCKA_USERNAME: ${{ secrets.ESIGNERCKA_USERNAME }}
           ESIGNERCKA_PASSWORD: ${{ secrets.ESIGNERCKA_PASSWORD }}
@@ -249,6 +254,10 @@ jobs:
           echo 'WIN_CERTIFICATE_SHA1=' >> $GITHUB_ENV
           echo 'WIN_SIGNING_HASH_ALGORITHMS=' >> $GITHUB_ENV
           echo 'SIGNTOOL_PATH=' >> $GITHUB_ENV
+
+          # NOTE: electron-builder 22.14.13 は指定したsigntoolを使わないのでワークアラウンド
+          CACHE_SIGNTOOL_PATH=$ELECTRON_BUILDER_CACHE/winCodeSign/winCodeSign-2.6.0/windows-10/x64/signtool.exe
+          mv $CACHE_SIGNTOOL_PATH{.bak,}
         env:
           THUMBPRINT_PATH: /tmp/esignercka_thumbprint.txt
 
@@ -668,6 +677,11 @@ jobs:
           echo "WIN_CERTIFICATE_SHA1=$(head -n 1 $THUMBPRINT_PATH)" >> $GITHUB_ENV
           echo 'WIN_SIGNING_HASH_ALGORITHMS=["sha256"]' >> $GITHUB_ENV
           echo "SIGNTOOL_PATH=$(head -n 1 $SIGNTOOL_PATH_PATH)" >> $GITHUB_ENV
+
+          # NOTE: electron-builder 22.14.13 は指定したsigntoolを使わないのでワークアラウンド
+          CACHE_SIGNTOOL_PATH=$ELECTRON_BUILDER_CACHE/winCodeSign/winCodeSign-2.6.0/windows-10/x64/signtool.exe
+          mv $CACHE_SIGNTOOL_PATH{,.bak}
+          cp $SIGNTOOL_PATH $CACHE_SIGNTOOL_PATH
         env:
           ESIGNERCKA_USERNAME: ${{ secrets.ESIGNERCKA_USERNAME }}
           ESIGNERCKA_PASSWORD: ${{ secrets.ESIGNERCKA_PASSWORD }}
@@ -700,6 +714,10 @@ jobs:
           echo 'WIN_CERTIFICATE_SHA1=' >> $GITHUB_ENV
           echo 'WIN_SIGNING_HASH_ALGORITHMS=' >> $GITHUB_ENV
           echo 'SIGNTOOL_PATH=' >> $GITHUB_ENV
+
+          # NOTE: electron-builder 22.14.13 は指定したsigntoolを使わないのでワークアラウンド
+          CACHE_SIGNTOOL_PATH=$ELECTRON_BUILDER_CACHE/winCodeSign/winCodeSign-2.6.0/windows-10/x64/signtool.exe
+          mv $CACHE_SIGNTOOL_PATH{.bak,}
         env:
           THUMBPRINT_PATH: /tmp/esignercka_thumbprint.txt