diff --git a/.github/workflows/electron.yml b/.github/workflows/electron.yml index 9b23ccd8..cba37c1e 100644 --- a/.github/workflows/electron.yml +++ b/.github/workflows/electron.yml @@ -31,7 +31,7 @@ jobs: - name: Install dependencies run: npm install - - name: Download certificate file + - name: Download certificate file for Mac run: | if [ "$RUNNER_OS" == "macOS" ]; then echo $APPLE_DEVELOPER_ID_FILE | base64 --decode >> developer-id.p12 @@ -54,6 +54,25 @@ jobs: AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Code signing for Windows + run: | + if [ "$RUNNER_OS" == "Windows" ]; then + set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true + dotnet tool install --global AzureSignTool --version 2.0.17 + AzureSignTool.exe sign -du "https://explorers.biblekids.io" ^ + -kvu "https://bccm-code-sign2.vault.azure.net" ^ + -kvi $WINDOWS_CLIENT_ID ^ + -kvs $WINDOWS_CLIENT_PASSWORD ^ + -kvc "BCC MEDIA STI" ^ + -tr http://timestamp.digicert.com ^ + -v ^ + $(System.DefaultWorkingDirectory)\dist-app\Bible-Explorers-Setup-1.6.9.exe + fi + shell: bash + env: + WINDOWS_CLIENT_ID: ${{secrets.BCCM_WINDOWS_CLIENT_ID}} + WINDOWS_CLIENT_PASSWORD: ${{secrets.BCCM_WINDOWS_CLIENT_PASSWORD}} + - name: Building the Electron app for Mac run: | if [ "$RUNNER_OS" == "macOS" ]; then diff --git a/electron_builder.js b/electron_builder.js index ba8a7c07..9138ff19 100644 --- a/electron_builder.js +++ b/electron_builder.js @@ -12,13 +12,15 @@ const config = { output: 'dist-app', }, nsis: { - artifactName: process.platform == 'win32' ? '${productName}-Setup-${version}.${ext}' : '${productName}-${version}.${ext}', + artifactName: + process.platform == 'win32' + ? '${productName}-Setup-${version}.${ext}' + : '${productName}-${version}.${ext}', }, win: { target: 'nsis', - publisherName: 'BCC Media', - verifyUpdateCodeSignature: false, // Disable publisher name check until we get the signature in place for Windows - legalTrademarks: '(C) 2024 BCC Media', + publisherName: 'BCC MEDIA STI', + legalTrademarks: '(C) 2024 BCC MEDIA STI', }, mac: { category: 'public.app-category.game', diff --git a/package.json b/package.json index 8533bf92..ee1aa6a9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bible-explorers", - "version": "1.6.8", + "version": "1.6.9", "description": "App for Bible Explorers", "main": ".vite/build/main.js", "repository": {