From 3e5da3ca2b098eeb0c880ea0718a8d80f5fb1ca2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 7 Apr 2026 16:07:42 +0100
Subject: [PATCH 1/3] Fix hak check for matrix-seshat (backport #33030)
 (#33063)

---
 apps/desktop/hak/matrix-seshat/check.ts | 13 +++++++++----
 apps/desktop/scripts/hak/hakEnv.ts      |  3 +++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/apps/desktop/hak/matrix-seshat/check.ts b/apps/desktop/hak/matrix-seshat/check.ts
index a62a239c80..99a107eb5a 100644
--- a/apps/desktop/hak/matrix-seshat/check.ts
+++ b/apps/desktop/hak/matrix-seshat/check.ts
@@ -14,10 +14,7 @@ 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"],
-        ["python", "--version"], // node-gyp uses python for reasons beyond comprehension
-    ];
+    const tools: Tool[] = [["rustc", "--version"]];
     if (hakEnv.isWin()) {
         tools.push(["perl", "--version"]); // for openssl configure
         tools.push(["nasm", "-v"]); // for openssl building
@@ -28,6 +25,14 @@ export default async function (hakEnv: HakEnv, moduleInfo: DependencyInfo): Prom
     }
     await hakEnv.checkTools(tools);
 
+    try {
+        // node-gyp uses python for reasons beyond comprehension
+        // Try python3 first, to get a more sensible error if python is not found in the fallback
+        await hakEnv.checkTools([["python3", "--version"]]);
+    } catch {
+        await hakEnv.checkTools([["python", "--version"]]);
+    }
+
     // Ensure Rust target exists (nb. we avoid depending on rustup)
     await new Promise((resolve, reject) => {
         const rustc = childProcess.execFile(
diff --git a/apps/desktop/scripts/hak/hakEnv.ts b/apps/desktop/scripts/hak/hakEnv.ts
index edab24419b..4ce382dc11 100644
--- a/apps/desktop/scripts/hak/hakEnv.ts
+++ b/apps/desktop/scripts/hak/hakEnv.ts
@@ -103,6 +103,9 @@ export default class HakEnv {
                 shell: this.isWin(),
                 ...options,
             });
+            proc.on("error", (err) => {
+                reject(err);
+            });
             proc.on("exit", (code) => {
                 if (code) {
                     reject(code);

From 7f5ab70478c4f4cd48ef0c74923d0391a76a1adc Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 8 Apr 2026 07:26:28 +0000
Subject: [PATCH 2/3] v1.12.15-rc.0

---
 apps/desktop/package.json | 2 +-
 apps/web/package.json     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index e43c10023e..1e4b773971 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -3,7 +3,7 @@
     "productName": "Element",
     "main": "lib/electron-main.js",
     "exports": "./lib/electron-main.js",
-    "version": "1.12.13",
+    "version": "1.12.15-rc.0",
     "description": "Element: the future of secure communication",
     "author": {
         "name": "Element",
diff --git a/apps/web/package.json b/apps/web/package.json
index 856e49ea5d..7db963ebf8 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -1,6 +1,6 @@
 {
     "name": "element-web",
-    "version": "1.12.14",
+    "version": "1.12.15-rc.0",
     "description": "Element: the future of secure communication",
     "author": "New Vector Ltd.",
     "repository": {

From 85670844093b9c9c58c9e91cb746e27fe1f35a1d Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 8 Apr 2026 07:48:17 +0000
Subject: [PATCH 3/3] v1.12.15

---
 CHANGELOG.md              | 6 ++++++
 apps/desktop/package.json | 2 +-
 apps/web/package.json     | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52838eb8ac..4b87749adb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [1.12.15](https://github.com/element-hq/element-web/releases/tag/v1.12.15) (2026-04-08)
+==================================================================================================
+Fixes Desktop release workflow.
+
+This release is identical to v1.12.14 otherwise.
+
 Changes in [1.12.14](https://github.com/element-hq/element-web/releases/tag/v1.12.14) (2026-04-07)
 ==================================================================================================
 ## ✨ Features
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 1e4b773971..b7b552e711 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -3,7 +3,7 @@
     "productName": "Element",
     "main": "lib/electron-main.js",
     "exports": "./lib/electron-main.js",
-    "version": "1.12.15-rc.0",
+    "version": "1.12.15",
     "description": "Element: the future of secure communication",
     "author": {
         "name": "Element",
diff --git a/apps/web/package.json b/apps/web/package.json
index 7db963ebf8..612431d1e3 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -1,6 +1,6 @@
 {
     "name": "element-web",
-    "version": "1.12.15-rc.0",
+    "version": "1.12.15",
     "description": "Element: the future of secure communication",
     "author": "New Vector Ltd.",
     "repository": {