From 84aed3a78009c27d2ce2a5fbc5530d382908bc55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mauro=20Balad=C3=A9s?= <mauro.balades@tutanota.com>
Date: Fri, 13 Sep 2024 10:11:47 -0700
Subject: [PATCH 1/2] Refactor .gitignore and add windsign-temp/

---
 .gitignore             |  4 +++-
 build/winsign/sign.ps1 | 44 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 build/winsign/sign.ps1

diff --git a/.gitignore b/.gitignore
index 5dab0f026..b700d6f23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,6 @@ node_modules/
 .surfer/
 
 __pycache__/
-dist/
\ No newline at end of file
+dist/
+
+windsign-temp/
\ No newline at end of file
diff --git a/build/winsign/sign.ps1 b/build/winsign/sign.ps1
new file mode 100644
index 000000000..8475ff8c0
--- /dev/null
+++ b/build/winsign/sign.ps1
@@ -0,0 +1,44 @@
+param(
+    [string]$RunID,
+    [string]$SignIdentity
+)
+
+$ErrorActionPreference = "Stop"
+
+echo "Preparing environment"
+mkdir windsign-temp -ErrorAction SilentlyContinue
+mkdir engine\obj-x86_64-pc-windows-msvc\dist -ErrorAction SilentlyContinue
+
+pnpm surfer ci --brand alpha
+
+echo "Downloading from runner with ID $RunID"
+gh run download $RunID --pattern "windows-x64-obj-*" --dir windsign-temp
+
+function SignAndPackage($name) {
+    echo "Executing on $name"
+    rmdir engine\obj-x86_64-pc-windows-msvc\dist\ -Recurse -ErrorAction SilentlyContinue
+    mv windsign-temp\windows-x64-obj-$name engine\obj-x86_64-pc-windows-msvc\dist
+    echo "Signing $name"
+    # Find all executables and dlls and sign them
+    Get-ChildItem engine\obj-x86_64-pc-windows-msvc\dist -Recurse -Filter *.exe | % {
+        echo "Signing $_"
+        signtool.exe sign /n "$SignIdentity" /t http://time.certum.pl/ /fd sha1 /v $_.FullName
+    }
+    Get-ChildItem engine\obj-x86_64-pc-windows-msvc\dist -Recurse -Filter *.dll | % {
+        echo "Signing $_"
+        signtool.exe sign /n "$SignIdentity" /t http://time.certum.pl/ /fd sha1 /v $_.FullName
+    }
+    echo "Packaging $name"
+    pnpm surfer package
+}
+
+SignAndPackage specific
+SignAndPackage generic
+
+# Cleaning up
+
+echo "All done!"
+Read-Host "Press Enter to continue"
+
+echo "Cleaning up" 
+rmdir windsign-temp -Recurse -ErrorAction SilentlyContinue
\ No newline at end of file

From 016d8eb8064db90289de3ef85075c5e879dec5a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mauro=20Balad=C3=A9s?= <mauro.balades@tutanota.com>
Date: Fri, 13 Sep 2024 10:13:11 -0700
Subject: [PATCH 2/2] Refactor windows-alpha-build.yml to update artifact path

---
 .github/workflows/windows-alpha-build.yml |  2 +-
 build/winsign/sign.ps1                    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/windows-alpha-build.yml b/.github/workflows/windows-alpha-build.yml
index 2f31e1e8b..acdd40766 100644
--- a/.github/workflows/windows-alpha-build.yml
+++ b/.github/workflows/windows-alpha-build.yml
@@ -216,4 +216,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: windows-x64-obj-${{ matrix.generic == true && 'generic' || 'specific' }}
-          path: engine/obj-x86_64-pc-windows-msvc/dist
\ No newline at end of file
+          path: engine/obj-x86_64-pc-windows-msvc/
\ No newline at end of file
diff --git a/build/winsign/sign.ps1 b/build/winsign/sign.ps1
index 8475ff8c0..6cc1f4f86 100644
--- a/build/winsign/sign.ps1
+++ b/build/winsign/sign.ps1
@@ -7,7 +7,7 @@ $ErrorActionPreference = "Stop"
 
 echo "Preparing environment"
 mkdir windsign-temp -ErrorAction SilentlyContinue
-mkdir engine\obj-x86_64-pc-windows-msvc\dist -ErrorAction SilentlyContinue
+mkdir engine\obj-x86_64-pc-windows-msvc\ -ErrorAction SilentlyContinue
 
 pnpm surfer ci --brand alpha
 
@@ -16,15 +16,15 @@ gh run download $RunID --pattern "windows-x64-obj-*" --dir windsign-temp
 
 function SignAndPackage($name) {
     echo "Executing on $name"
-    rmdir engine\obj-x86_64-pc-windows-msvc\dist\ -Recurse -ErrorAction SilentlyContinue
-    mv windsign-temp\windows-x64-obj-$name engine\obj-x86_64-pc-windows-msvc\dist
+    rmdir engine\obj-x86_64-pc-windows-msvc\ -Recurse -ErrorAction SilentlyContinue
+    mv windsign-temp\windows-x64-obj-$name engine\obj-x86_64-pc-windows-msvc\
     echo "Signing $name"
     # Find all executables and dlls and sign them
-    Get-ChildItem engine\obj-x86_64-pc-windows-msvc\dist -Recurse -Filter *.exe | % {
+    Get-ChildItem engine\obj-x86_64-pc-windows-msvc\ -Recurse -Filter *.exe | % {
         echo "Signing $_"
         signtool.exe sign /n "$SignIdentity" /t http://time.certum.pl/ /fd sha1 /v $_.FullName
     }
-    Get-ChildItem engine\obj-x86_64-pc-windows-msvc\dist -Recurse -Filter *.dll | % {
+    Get-ChildItem engine\obj-x86_64-pc-windows-msvc\ -Recurse -Filter *.dll | % {
         echo "Signing $_"
         signtool.exe sign /n "$SignIdentity" /t http://time.certum.pl/ /fd sha1 /v $_.FullName
     }