ディレクトリをコピー

Hiroshiba · Oct 3, 2023 · 8e36f88 · 8e36f88
1 parent 95acb68
commit 8e36f88
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -223,10 +223,10 @@ jobs:
           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}
-          ln -s "$(head -n 1 $SIGNTOOL_PATH_PATH)" "$CACHE_SIGNTOOL_PATH"
+          # 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}
+          ln -s "$(dirname $(head -n 1 $SIGNTOOL_PATH_PATH))" "$CACHE_SIGNTOOL_DIR"
         env:
           ESIGNERCKA_USERNAME: ${{ secrets.ESIGNERCKA_USERNAME }}
           ESIGNERCKA_PASSWORD: ${{ secrets.ESIGNERCKA_PASSWORD }}
@@ -256,9 +256,10 @@ jobs:
           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,}
+          # NOTE: ワークアラウンドで差し替えたディレクトリを元に戻す
+          CACHE_SIGNTOOL_DIR="$ELECTRON_BUILDER_CACHE/winCodeSign/winCodeSign-2.6.0/windows-10/x64"
+          rm -r "$CACHE_SIGNTOOL_DIR"
+          mv "$CACHE_SIGNTOOL_DIR"{.bak,}
         env:
           THUMBPRINT_PATH: /tmp/esignercka_thumbprint.txt
 
@@ -680,10 +681,10 @@ jobs:
           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}
-          ln -s "$(head -n 1 $SIGNTOOL_PATH_PATH)" "$CACHE_SIGNTOOL_PATH"
+          # 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}
+          ln -s "$(dirname $(head -n 1 $SIGNTOOL_PATH_PATH))" "$CACHE_SIGNTOOL_DIR"
         env:
           ESIGNERCKA_USERNAME: ${{ secrets.ESIGNERCKA_USERNAME }}
           ESIGNERCKA_PASSWORD: ${{ secrets.ESIGNERCKA_PASSWORD }}
@@ -717,9 +718,10 @@ jobs:
           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,}
+          # NOTE: ワークアラウンドで差し替えたディレクトリを元に戻す
+          CACHE_SIGNTOOL_DIR="$ELECTRON_BUILDER_CACHE/winCodeSign/winCodeSign-2.6.0/windows-10/x64"
+          rm -r "$CACHE_SIGNTOOL_DIR"
+          mv "$CACHE_SIGNTOOL_DIR"{.bak,}
         env:
           THUMBPRINT_PATH: /tmp/esignercka_thumbprint.txt