Merge remote-tracking branch 'origin/t3chguy/consolidate-build-test-ci' into t3chguy/consolidate-build-test-ci

Author: t3chguy

.github/workflows/build_desktop_macos.yaml

@@ -128,21 +128,22 @@ jobs:
               working-directory: apps/desktop
               run: pnpm run build:native:universal
 
-            - name: "Build App"
+            # We split these because electron-builder gets upset if we set CSC_LINK even to an empty string
+            - name: "[Signed] Build App"
+              if: inputs.sign != ''
               working-directory: apps/desktop
-              run: pnpm run build:universal --publish never -m ${TARGETS}
+              run: |
+                  pnpm run build:universal --publish never -m ${TARGETS}
               env:
-                  # Code signing parameters
-                  CSC_IDENTITY_AUTO_DISCOVERY: ${{ inputs.sign != '' }}
-                  APPLE_TEAM_ID: ${{ case(inputs.sign != '', vars.APPLE_TEAM_ID, '') }}
-                  APPLE_ID: ${{ case(inputs.sign != '', secrets.APPLE_ID, '') }}
-                  APPLE_APP_SPECIFIC_PASSWORD: ${{ case(inputs.sign != '', secrets.APPLE_ID_PASSWORD, '') }}
-                  CSC_KEY_PASSWORD: ${{ case(inputs.sign != '', secrets.APPLE_CSC_KEY_PASSWORD, '') }}
-                  CSC_LINK: ${{ case(inputs.sign != '', secrets.APPLE_CSC_LINK, '') }}
+                  APPLE_TEAM_ID: ${{ vars.APPLE_TEAM_ID }}
+                  APPLE_ID: ${{ secrets.APPLE_ID }}
+                  APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
+                  CSC_KEY_PASSWORD: ${{ secrets.APPLE_CSC_KEY_PASSWORD }}
+                  CSC_LINK: ${{ secrets.APPLE_CSC_LINK }}
                   VARIANT_PATH: variant.json
-                  TARGETS: ${{ inputs.targets }}
                   # Only set for Nightly builds
                   VERSION: ${{ inputs.version }}
+                  TARGETS: ${{ inputs.targets }}
 
             - name: Check app was signed & notarised successfully
               if: inputs.sign != ''
@@ -153,6 +154,16 @@ jobs:
                   spctl -a -vvv -t install /Volumes/Element/*.app
                   hdiutil detach /Volumes/Element
 
+            - name: "[Unsigned] Build App"
+              if: inputs.sign == ''
+              working-directory: apps/desktop
+              run: |
+                  pnpm run build:universal --publish never -m ${TARGETS}
+              env:
+                  CSC_IDENTITY_AUTO_DISCOVERY: false
+                  VARIANT_PATH: variant.json
+                  TARGETS: ${{ inputs.targets }}
+
             - name: Generate releases.json
               if: inputs.base-url
               working-directory: apps/desktop

.github/workflows/build_desktop_prepare.yaml

@@ -111,7 +111,10 @@ jobs:
             - name: "[Nightly] Calculate version"
               id: versions
               if: inputs.nightly
+              working-directory: apps/desktop
               run: |
+                  set -e
+
                   # Find all latest Nightly versions
                   aws s3 cp s3://$R2_BUCKET/nightly/update/macos/releases.json - --endpoint-url $R2_URL --region auto | jq -r .currentRelease >> VERSIONS
                   aws s3 cp s3://$R2_BUCKET/debian/dists/default/main/binary-amd64/Packages - --endpoint-url $R2_URL --region auto | grep "Package: element-nightly" -A 50 | grep Version -m1 | sed -n 's/Version: //p' >> VERSIONS
@@ -164,6 +167,8 @@ jobs:
               if: inputs.nightly
               working-directory: apps/desktop
               run: |
+                  set -e
+
                   BUNDLE_HASH=$(npx asar l webapp.asar | grep /bundles/ | head -n 1 | sed 's|.*/||')
                   WEBAPP_VERSION=$(./scripts/get-version.ts)
                   WEB_VERSION=${WEBAPP_VERSION:0:12}

apps/desktop/.eslintrc.cjs

@@ -46,6 +46,7 @@ module.exports = {
                 // Things we do that break the ideal style
                 "prefer-promise-reject-errors": "off",
                 "quotes": "off",
+                "n/file-extension-in-import": "off",
 
                 "@typescript-eslint/no-explicit-any": "off",
                 // We're okay with assertion errors when we ask for them
@@ -62,6 +63,7 @@ module.exports = {
                 // Things we do that break the ideal style
                 "prefer-promise-reject-errors": "off",
                 "quotes": "off",
+                "n/file-extension-in-import": "off",
 
                 "@typescript-eslint/no-explicit-any": "off",
                 // We're okay with assertion errors when we ask for them

apps/desktop/electron-builder.ts

@@ -1,7 +1,7 @@
 import * as os from "node:os";
 import * as fs from "node:fs";
 import * as path from "node:path";
-import { type Configuration as BaseConfiguration, type Protocol } from "electron-builder";
+import { type Configuration as BaseConfiguration } from "electron-builder";
 
 /**
  * This script has different outputs depending on your os platform.
@@ -38,6 +38,7 @@ interface Metadata {
 interface ExtraMetadata extends Metadata {
     electron_appId: string;
     electron_protocol: string;
+    electron_windows_cert_sn?: string;
 }
 
 /**
@@ -208,6 +209,7 @@ if (variant["linux.deb.name"]) {
 if (process.env.ED_SIGNTOOL_SUBJECT_NAME && process.env.ED_SIGNTOOL_THUMBPRINT) {
     config.win.signtoolOptions!.certificateSubjectName = process.env.ED_SIGNTOOL_SUBJECT_NAME;
     config.win.signtoolOptions!.certificateSha1 = process.env.ED_SIGNTOOL_THUMBPRINT;
+    config.extraMetadata.electron_windows_cert_sn = config.win.signtoolOptions!.certificateSubjectName;
 }
 
 if (os.platform() === "linux") {

apps/desktop/hak/matrix-seshat/build.ts

@@ -6,8 +6,8 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import type HakEnv from "../../scripts/hak/hakEnv.js";
-import type { DependencyInfo } from "../../scripts/hak/dep.js";
+import type HakEnv from "../../scripts/hak/hakEnv.ts";
+import type { DependencyInfo } from "../../scripts/hak/dep.ts";
 
 export default async function (hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
     const env = hakEnv.makeGypEnv();

apps/desktop/hak/matrix-seshat/check.ts

@@ -9,9 +9,9 @@ Please see LICENSE files in the repository root for full details.
 import childProcess from "node:child_process";
 import fsProm from "node:fs/promises";
 
-import type HakEnv from "../../scripts/hak/hakEnv.js";
-import type { Tool } from "../../scripts/hak/hakEnv.js";
-import type { DependencyInfo } from "../../scripts/hak/dep.js";
+import type HakEnv from "../../scripts/hak/hakEnv.ts";
+import type { Tool } from "../../scripts/hak/hakEnv.ts";
+import type { DependencyInfo } from "../../scripts/hak/dep.ts";
 
 export default async function (hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
     const tools: Tool[] = [["rustc", "--version"]];

apps/desktop/hak/tsconfig.json

@@ -6,7 +6,8 @@
         "sourceMap": false,
         "strict": true,
         "lib": ["es2022"],
-        "types": ["node"]
+        "types": ["node"],
+        "allowImportingTsExtensions": true
     },
     "include": ["../scripts/@types/*.d.ts", "./**/*.ts"]
 }

apps/desktop/package.json

@@ -18,15 +18,15 @@
     "type": "module",
     "files": [],
     "engines": {
-        "node": ">=18.0.0"
+        "node": ">=22.18"
     },
     "scripts": {
         "i18n": "matrix-gen-i18n && pnpm i18n:sort && pnpm i18n:lint",
         "i18n:sort": "matrix-sort-i18n src/i18n/strings/en_EN.json",
         "i18n:lint": "prettier --log-level=silent  --write src/i18n/strings/ --ignore-path /dev/null",
         "i18n:diff": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && pnpm i18n && matrix-compare-i18n-files src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json",
         "mkdirs": "mkdirp packages deploys",
-        "fetch": "pnpm run mkdirs && tsx scripts/fetch-package.ts",
+        "fetch": "pnpm run mkdirs && node scripts/fetch-package.ts",
         "asar-webapp": "asar p webapp webapp.asar",
         "start": "pnpm run build:ts && pnpm run build:res && electron .",
         "lint": "pnpm lint:types && pnpm lint:js",
@@ -44,13 +44,13 @@
         "build:universal": "pnpm run build:ts && pnpm run build:res && electron-builder --universal",
         "build": "pnpm run build:ts && pnpm run build:res && electron-builder",
         "build:ts": "tsc",
-        "build:res": "tsx scripts/copy-res.ts",
+        "build:res": "node scripts/copy-res.ts",
         "docker:setup": "docker build --platform linux/amd64 -t element-desktop-dockerbuild -f dockerbuild/Dockerfile .",
         "docker:build:native": "scripts/in-docker.sh pnpm run hak",
         "docker:build": "scripts/in-docker.sh pnpm run build",
         "docker:install": "scripts/in-docker.sh pnpm install",
         "clean": "rimraf webapp.asar dist packages deploys lib",
-        "hak": "tsx scripts/hak/index.ts",
+        "hak": "node scripts/hak/index.ts",
         "test": "playwright test",
         "test:open": "pnpm test --ui",
         "test:screenshots:build": "docker build playwright -t element-desktop-playwright --platform linux/amd64",
@@ -102,7 +102,6 @@
         "prettier": "^3.0.0",
         "rimraf": "^6.0.0",
         "tar": "^7.5.8",
-        "tsx": "^4.19.2",
         "typescript": "5.9.3"
     },
     "hakDependencies": {

apps/desktop/scripts/copy-res.ts

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S npx tsx
+#!/usr/bin/env node
 
 // copies resources into the lib directory.
 

apps/desktop/scripts/fetch-package.ts

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S npx tsx --resolveJsonModule
+#!/usr/bin/env node
 
 import * as path from "node:path";
 import { createWriteStream, promises as fs } from "node:fs";
@@ -7,8 +7,8 @@ import * as tar from "tar";
 import * as asar from "@electron/asar";
 import { promises as stream } from "node:stream";
 
-import riotDesktopPackageJson from "../package.json";
-import { setPackageVersion } from "./set-version.js";
+import riotDesktopPackageJson from "../package.json" with { type: "json" };
+import { setPackageVersion } from "./set-version.ts";
 
 const PUB_KEY_URL = "https://packages.riot.im/element-release-key.asc";
 const PACKAGE_URL_PREFIX = "https://github.com/element-hq/element-web/releases/download/";