Use github workspace for working dir

alertlogic · Jan 27, 2021 · 3f79c44 · 3f79c44
1 parent da7b187
commit 3f79c44
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/windows_build.yml b/.github/workflows/windows_build.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: '3.x'
+          python-version: '3.8'
       - name: Install requirements
         run: |
           python -m pip install -r requirements.txt
@@ -30,6 +30,9 @@ jobs:
           python setup.py bdist_msi
           python scripts/windows/write_alcli_version.py
       - name: Sign
+        env:
+          CERT: ${{ secrets.CERT }}
+          CERT_PWD: ${{ secrets.CERT_PWD }}
         run: |
           powershell scripts/windows/cleanup.ps1
           powershell scripts/windows/verpatch_cli.ps1

diff --git a/scripts/windows/alcli_windows_install.iss b/scripts/windows/alcli_windows_install.iss
@@ -8,7 +8,7 @@
 #define MyAppPublisher "Alert Logic, Inc."
 #define MyAppURL "https://github.com/alertlogic/alcli"
 #define MyAppExeName "alcli.exe"
-#define WorkingDir "C:\Users\travis\build\alertlogic\alcli\"
+#define WorkingDir "{%GITHUB_WORKSPACE}"
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.

diff --git a/scripts/windows/load_sign_cert.ps1 b/scripts/windows/load_sign_cert.ps1
@@ -1,5 +1,5 @@
 $ErrorActionPreference = "Stop"
-$decoded = [System.Convert]::FromBase64CharArray($Env:cert, 0, $Env:cert.Length);
+$decoded = [System.Convert]::FromBase64CharArray($Env:CERT, 0, $Env:CERT.Length);
 $decoded | Set-Content cert.p12 -Encoding Byte;
-$Password = ConvertTo-SecureString -String $Env:cert_pwd -AsPlainText -Force
+$Password = ConvertTo-SecureString -String $Env:CERT_PWD -AsPlainText -Force
 Import-PfxCertificate -FilePath cert.p12 -CertStoreLocation Cert:\LocalMachine\My -Password $Password