From 2a0757d98de50c48a70e8010f5967d676b2ae1dc Mon Sep 17 00:00:00 2001
From: Michael Rittmeister <michael@rittmeister.in>
Date: Sat, 12 Aug 2023 15:29:14 +0200
Subject: [PATCH] Prepare migration of code signing to certum

---
 .github/workflows/ci.yml          | 10 ++--------
 app/desktop/msix/appxmanifest.xml |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 58a9865..cd92fde 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -37,7 +37,7 @@ jobs:
     name: Build Desktop App
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-latest, windows-signing]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
@@ -88,12 +88,6 @@ jobs:
       - name: Setup MSbuild
         if: matrix.os == 'windows-latest'
         uses: microsoft/setup-msbuild@v1.3.1
-      - name: Create Code Signing Certificate
-        if: matrix.os == 'windows-latest'
-        run: |
-          New-Item -ItemType directory -Path certificate
-          Set-Content -Path certificate\certificate.txt -Value '${{ secrets.WINDOWS_CERTIFICATE }}'
-          certutil -decode certificate\certificate.txt certificate\certificate.pfx
       - name: Build MSIX
         if: matrix.os == 'windows-latest'
         run: |
@@ -101,7 +95,7 @@ jobs:
       - name: Code Sign 2021
         if: matrix.os == 'windows-latest'
         run: |
-          & 'C:/Program Files (x86)/Windows Kits/10/bin/10.0.22621.0/x86/signtool.exe' sign /fd SHA256 /f certificate\certificate.pfx /p '${{ secrets.WINDOWS_CERTIFICATE_PASSWORD }}' /t http://timestamp.sectigo.com/ /d Tonbrett Tonbrett.msix
+          & 'C:/Program Files (x86)/Windows Kits/10/bin/10.0.22621.0/x86/signtool.exe' sign /fd SHA256 /n "Open Source Developer, Michael Rittmeister" /t http://time.certum.pl/ /d Tonbrett Tonbrett.msix
       - name: Notarize MacOS installer
         #if: matrix.os == 'macos-latest'
         # waiting for https://github.com/JetBrains/compose-multiplatform/issues/3208
diff --git a/app/desktop/msix/appxmanifest.xml b/app/desktop/msix/appxmanifest.xml
index 148d628..8bc7e67 100644
--- a/app/desktop/msix/appxmanifest.xml
+++ b/app/desktop/msix/appxmanifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5" xmlns:uap10="http://schemas.microsoft.com/appx/manifest/uap/windows10/10">
   <!-- DO NOT EDIT THIS VERSION IT IS UPDATED AUTOMATICALLY -->
-  <Identity Name="dev.schlaubi.Tonbrett" Version="0.0.0.0" Publisher="CN=Michael Rittmeister, O=Michael Rittmeister, S=Bayern, C=DE" ProcessorArchitecture="x64" />
+   <Identity Name="dev.schlaubi.Tonbrett" Version="0.0.0.0" Publisher="E=michael@rittmeister.in, CN=&quot;Open Source Developer, Michael Rittmeister&quot;, O=Open Source Developer, L=Gauting, S=Bavaria, C=DE" ProcessorArchitecture="x64" />
   <Properties>
     <DisplayName>Tonbrett</DisplayName>
     <PublisherDisplayName>Schlaubi</PublisherDisplayName>