Merge 2.22.2-beta.3 into trunk

.buildkite/commands/package_windows.ps1

@@ -26,7 +26,7 @@ If (Test-Path $certPath) {
     [System.Environment]::SetEnvironmentVariable('CSC_LINK', $certPath, [System.EnvironmentVariableTarget]::Machine)
     Write-Host "Environment variable CSC_LINK set to $certPath"
 } else {
-    Write-Host "[!] certificate.pfx file does not exist."
+    Write-Host "[!] Certificate file does not exist at given path $certPath."
     Exit 1
 }
 
@@ -38,8 +38,8 @@ Import-PfxCertificate -FilePath $certPath -CertStoreLocation Cert:\LocalMachine\
 Write-Host "--- :windows: Installing make"
 choco install make
 
-Write-Host "--- :npm: Installing dependencies"
-npm ci --legacy-peer-deps
+bash ".\.buildkite\commands\install_node_dependencies.sh"
+If ($LastExitCode -ne 0) { Exit $LastExitCode }
 
 Write-Host "--- :lock_with_ink_pen: Decrypting secrets"
 make decrypt_conf

.buildkite/pipeline.yml

@@ -64,6 +64,7 @@ steps:
     artifact_paths:
       - release/*.dmg
       - release/*.dmg.blockmap
+      - release/*.zip*
       - release/latest*.yml
 
   - label: Package on Windows

Makefile

@@ -141,18 +141,18 @@ package: build-if-changed
 
 .PHONY: package-win32
 package-win32:
-	@echo Packaging .exe...
+	@echo "Packaging exe..."
 	@npx electron-builder --win -p $(PUBLISH)
-ifeq ($(IS_WINDOWS),true)
-	@echo Packaging .appx as well...
+	# Note: the configuration required to generate a code signed exe via the `nsis` target will conflict with the `appx` configuration.
+	# In practice, "certificateSubjectName": "Automattic, Inc." is required to sign the exe, but if that setting is present and so are the `appx` settings, there will be a failure.
+	# Hence the need for a separate configuration here.
+	# See also in https://github.com/electron-userland/electron-builder/issues/6698
+	@echo "Packaging appx — with dedicated configuration to work around code signing conflicts..."
 	@npx electron-builder --win -p $(PUBLISH) --config=./electron-builder-appx.json
-else
-	@echo Skipping packaging .appx because we are not running on a Windows machine.
-endif
 
 .PHONY: package-osx
 package-osx: build-if-changed
-	@npx electron-builder --mac "dmg" -p $(PUBLISH)
+	@npx electron-builder --mac -p $(PUBLISH)
 
 .PHONY: package-linux
 package-linux: build-if-changed

electron-builder-appx.json

@@ -2,8 +2,8 @@
   "productName": "Simplenote",
   "appId": "com.automattic.simplenote",
   "directories": {
-    "output": "release",
-    "buildResources": "resources"
+    "output": "./release",
+    "buildResources": "./resources"
   },
   "files": ["desktop", "dist", "shared"],
   "win": {
@@ -29,7 +29,5 @@
       "name": "simplenote",
       "schemes": ["simplenote"]
     }
-  ],
-  "afterSign": "./after_sign_hook.js",
-  "afterAllArtifactBuild": "./after_sign_hook.js"
+  ]
 }

electron-builder.json

@@ -1,6 +1,7 @@
 {
   "productName": "Simplenote",
   "appId": "com.automattic.simplenote",
+  "generateUpdatesFilesForAllChannels": true,
   "directories": {
     "output": "./release",
     "buildResources": "./resources"
@@ -22,7 +23,8 @@
         "target": "zip",
         "arch": ["universal"]
       }
-    ]
+    ],
+    "mergeASARs": false
   },
   "dmg": {
     "title": "Simplenote Installer",
@@ -52,17 +54,9 @@
       {
         "target": "nsis",
         "arch": ["ia32", "x64"]
-      },
-      {
-        "target": "appx",
-        "arch": ["ia32", "x64"]
       }
     ]
   },
-  "appx": {
-    "backgroundColor": "transparent",
-    "showNameOnTiles": true
-  },
   "nsis": {
     "artifactName": "Simplenote-win-${version}-${arch}.${ext}",
     "deleteAppDataOnUninstall": true,

package.json

@@ -6,7 +6,7 @@
     "email": "[email protected]"
   },
   "productName": "Simplenote",
-  "version": "2.22.1",
+  "version": "2.22.2-beta.3",
   "main": "desktop/index.js",
   "license": "GPL-2.0",
   "homepage": "https://simplenote.com",