From da8f6af0ae16a6f74b36dcb4bc4009cb172acb05 Mon Sep 17 00:00:00 2001
From: Chris Price <chris@momentohq.com>
Date: Tue, 26 Mar 2024 09:39:31 -0700
Subject: [PATCH] chore: testing installation of digicert tools

---
 .github/workflows/execute-release.yml | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/execute-release.yml b/.github/workflows/execute-release.yml
index d7bf4726..26a37926 100644
--- a/.github/workflows/execute-release.yml
+++ b/.github/workflows/execute-release.yml
@@ -344,16 +344,8 @@ jobs:
 #          smctl healthcheck
 #        shell: cmd
 
-      - name: Test and cache signtool path
-        id: signtool
-        run: |
-          $signtool = "C:/Program Files (x86)/Windows Kits/10/bin/10.0.17763.0/x86/signtool.exe"
-          Test-Path -Path $signtool -PathType Leaf
-          echo "::set-output name=signtool_path::$signtool"
-
       - name: Sign Momento binary
         env:
-          SIGNTOOL_PATH: ${{ steps.signtool.outputs.signtool_path }}
           MOMENTO_BINARY_PATH: ${{ steps.build.outputs.momento_binary_path }}
           SM_HOST: ${{ secrets.CODE_SIGNING_HOST }}
           SM_API_KEY: ${{ secrets.CODE_SIGNING_API_KEY }}
@@ -362,8 +354,8 @@ jobs:
         run: |
           echo "HERE IS THE SIGNTOOL PATH:"
           echo $env:SIGNTOOL_PATH
-          "$env:SIGNTOOL_PATH" sign /sha1 ${{ secrets.CODE_SIGNING_CERT_SHA1_HASH }} /tr http://timestamp.digicert.com /td SHA256 /fd SHA256 $env:MOMENTO_BINARY_PATH
-          $env:SIGNTOOL_PATH verify /v /pa $env:MOMENTO_BINARY_PATH
+          signtool.exe sign /sha1 ${{ secrets.CODE_SIGNING_CERT_SHA1_HASH }} /tr http://timestamp.digicert.com /td SHA256 /fd SHA256 $env:MOMENTO_BINARY_PATH
+          signtool.exe verify /v /pa $env:MOMENTO_BINARY_PATH
 
       - name: Create zip
         id: create_zip
@@ -399,7 +391,6 @@ jobs:
 
       - name: Sign installer
         env:
-          SIGNTOOL_PATH: ${{ steps.signtool.outputs.signtool_path }}
           MSI_PATH: ${{ steps.build_installer.outputs.asset_path }}
           SM_HOST: ${{ secrets.CODE_SIGNING_HOST }}
           SM_API_KEY: ${{ secrets.CODE_SIGNING_API_KEY }}
@@ -408,8 +399,8 @@ jobs:
         run: |
           echo "HERE IS THE SIGNTOOL PATH:"
           echo $env:SIGNTOOL_PATH
-          "$env:SIGNTOOL_PATH" sign /sha1 ${{ secrets.CODE_SIGNING_CERT_SHA1_HASH }} /tr http://timestamp.digicert.com /td SHA256 /fd SHA256 $env:MSI_PATH
-          $env:SIGNTOOL_PATH verify /v /pa $env:MSI_PATH
+          signtool.exe sign /sha1 ${{ secrets.CODE_SIGNING_CERT_SHA1_HASH }} /tr http://timestamp.digicert.com /td SHA256 /fd SHA256 $env:MSI_PATH
+          signtool.exe verify /v /pa $env:MSI_PATH
 
       - name: Delete PFX certificate
         env: