From 662b10150a2e1cd7ef76b32c7540b048795b890c Mon Sep 17 00:00:00 2001
From: Sondre Solbakken <sondre.solbakken@cognite.com>
Date: Tue, 5 Sep 2023 11:18:52 +0200
Subject: [PATCH] Try not adding cert twice

---
 .github/workflows/run-action.yaml |  8 ++++----
 action.yaml                       | 10 ++++------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/run-action.yaml b/.github/workflows/run-action.yaml
index bb76eb49..eb7de1b6 100644
--- a/.github/workflows/run-action.yaml
+++ b/.github/workflows/run-action.yaml
@@ -20,7 +20,7 @@ jobs:
           CERTIFICATE_SHA1_HASH: ${{ secrets.CODE_SIGNING_CERT_SHA1_HASH }}
           CLIENT_CERTIFICATE: ${{ secrets.CODE_SIGNING_CLIENT_CERT }}
           CLIENT_CERTIFICATE_PASSWORD: ${{ secrets.CODE_SIGNING_CLIENT_CERT_PASSWORD }}
-        uses: cognitedata/code-sign-action/@v3.1
+        uses: cognitedata/code-sign-action/@v3.4
         with:
           path-to-binary: 'test\test.dll'
 
@@ -31,7 +31,7 @@ jobs:
           CERTIFICATE_SHA1_HASH: ${{ secrets.CODE_SIGNING_CERT_SHA1_HASH }}
           CLIENT_CERTIFICATE: ${{ secrets.CODE_SIGNING_CLIENT_CERT }}
           CLIENT_CERTIFICATE_PASSWORD: ${{ secrets.CODE_SIGNING_CLIENT_CERT_PASSWORD }}
-        uses: cognitedata/code-sign-action/@v3.1
+        uses: cognitedata/code-sign-action/@v3.4
         with:
           path-to-binary: 'test\test.dll'
 
@@ -48,7 +48,7 @@ jobs:
           CERTIFICATE_SHA1_HASH: ${{ secrets.CODE_SIGNING_CERT_SHA1_HASH }}
           CLIENT_CERTIFICATE: ${{ secrets.CODE_SIGNING_CLIENT_CERT }}
           CLIENT_CERTIFICATE_PASSWORD: ${{ secrets.CODE_SIGNING_CLIENT_CERT_PASSWORD }}
-        uses: cognitedata/code-sign-action/@v3.1
+        uses: cognitedata/code-sign-action/@v3.4
         with:
           path-to-binary: "test/test.dll"
 
@@ -59,6 +59,6 @@ jobs:
           CERTIFICATE_SHA1_HASH: ${{ secrets.CODE_SIGNING_CERT_SHA1_HASH }}
           CLIENT_CERTIFICATE: ${{ secrets.CODE_SIGNING_CLIENT_CERT }}
           CLIENT_CERTIFICATE_PASSWORD: ${{ secrets.CODE_SIGNING_CLIENT_CERT_PASSWORD }}
-        uses: cognitedata/code-sign-action/@v3.1
+        uses: cognitedata/code-sign-action/@v3.4
         with:
           path-to-binary: "test/test.dll"
diff --git a/action.yaml b/action.yaml
index d5ef4a27..7ccf87d6 100644
--- a/action.yaml
+++ b/action.yaml
@@ -10,13 +10,13 @@ runs:
     - name: Setup Certificate Windows
       run: |
         echo "${{env.CLIENT_CERTIFICATE }}" | base64 --decode > /d/cognite_code_signing_github_actions.p12
-      if: runner.os == 'Windows'
+      if: ${{ runner.os == 'Windows' && (!contains(env.DEPS_INSTALLED, 'TRUE')) }}
       shell: bash
 
     - name: Setup Certificate Linux
       run: |
         echo "${{env.CLIENT_CERTIFICATE }}" | base64 --decode | sudo install -D /dev/stdin /d/cognite_code_signing_github_actions.p12
-      if: runner.os == 'Linux'
+      if: ${{ runner.os == 'Linux' && (!contains(env.DEPS_INSTALLED, 'TRUE')) }}
       shell: bash
 
     - name: Set variables
@@ -79,10 +79,8 @@ runs:
       if: runner.os == 'Linux'
       shell: bash
 
-    - name: Set dependency envar
-      id: dep-var
+    - name: Mark dependencies as installed
+      id: dependency-variable
       run: |
-        echo "${{ env.DEPS_INSTALLED }}"
         echo "DEPS_INSTALLED=TRUE" >> "$GITHUB_ENV"
-        echo "${{ env.DEPS_INSTALLED }}"
       shell: bash