From 8f552c66d463eb4bbcb71a9af80270906882cbd2 Mon Sep 17 00:00:00 2001
From: Simon Costea <simoncostea@yahoo.com>
Date: Wed, 1 May 2024 17:01:52 +0300
Subject: [PATCH] Manually publish to GH & S3

---
 .github/workflows/electron.yml | 39 ++++++++++++++++++++++++++++------
 electron_builder.js            |  1 -
 package.json                   |  2 +-
 3 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/electron.yml b/.github/workflows/electron.yml
index 403a0237..659ac323 100644
--- a/.github/workflows/electron.yml
+++ b/.github/workflows/electron.yml
@@ -34,24 +34,51 @@ jobs:
             - name: Build for production
               run: npm run build:electron
 
-            - name: Build the Electron app, do code signing and publish the artifacts for Windows
+            - name: Build the Electron app & sign the code for Windows
               run: |
                   if [ "$RUNNER_OS" == "Windows" ]; then
                       npm run package
                       set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
                       dotnet tool install --global AzureSignTool --version 5.0.0
-                      AzureSignTool.exe sign -du "https://explorers.biblekids.io" -kvu "https://bccm-code-sign2.vault.azure.net" -kvt "$WINDOWS_DIRECTORY_ID" -kvi "$WINDOWS_CLIENT_ID" -kvs "$WINDOWS_CLIENT_PASSWORD" -kvc "HSM-CS" -tr "http://timestamp.digicert.com" -v "dist-app/Bible-Explorers-Setup-1.6.14.exe"
-                      npm run publish
+                      AzureSignTool.exe sign -du "https://explorers.biblekids.io" -kvu "https://bccm-code-sign2.vault.azure.net" -kvt "$WINDOWS_DIRECTORY_ID" -kvi "$WINDOWS_CLIENT_ID" -kvs "$WINDOWS_CLIENT_PASSWORD" -kvc "HSM-CS" -tr "http://timestamp.digicert.com" -v "dist-app/Bible-Explorers-Setup-1.6.15.exe"
                   fi
               shell: bash
               env:
-                  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-                  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
                   WINDOWS_DIRECTORY_ID: ${{secrets.BCCM_WINDOWS_DIRECTORY_ID}}
                   WINDOWS_CLIENT_ID: ${{secrets.BCCM_WINDOWS_CLIENT_ID}}
                   WINDOWS_CLIENT_PASSWORD: ${{secrets.BCCM_WINDOWS_CLIENT_PASSWORD}}
 
+            - name: Create release on GitHub for Windows
+              uses: actions/create-release@v1
+              if: matrix.os.name == 'windows'
+              id: create_release
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              with:
+                  tag_name: ${{ github.ref }}
+                  release_name: Release ${{ github.ref }}
+                  draft: false
+                  prerelease: false
+
+            - name: Upload assets to GitHub for Windows
+              uses: actions/upload-release-asset@v1
+              if: matrix.os.name == 'windows'
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              with:
+                  upload_url: ${{ steps.create_release.outputs.upload_url }}
+                  asset_path: ./dist-app/*
+                  asset_content_type: application/octet-stream
+
+            - name: Upload to Amazon S3 for Windows
+              run: |
+                  if [ "$RUNNER_OS" == "Windows" ]; then
+                      aws s3 cp ./dist-app/* s3://bccm-static/explorers/ --region eu-north-1
+                  fi
+              env:
+                  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+                  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+
             - name: Download certificate file & build the Electron app for Mac
               run: |
                   if [ "$RUNNER_OS" == "macOS" ]; then
diff --git a/electron_builder.js b/electron_builder.js
index f445a7bc..9138ff19 100644
--- a/electron_builder.js
+++ b/electron_builder.js
@@ -20,7 +20,6 @@ const config = {
     win: {
         target: 'nsis',
         publisherName: 'BCC MEDIA STI',
-        verifyUpdateCodeSignature: false, // Disable publisher name check until we get the signature in place for Windows
         legalTrademarks: '(C) 2024 BCC MEDIA STI',
     },
     mac: {
diff --git a/package.json b/package.json
index 65355374..ad0d8395 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bible-explorers",
-  "version": "1.6.14",
+  "version": "1.6.15",
   "description": "App for Bible Explorers",
   "main": ".vite/build/main.js",
   "repository": {