[24.11] electron-{source,bin,chromedriver}: 33.4.3 -> 33.4.5, 34.3.2 -> 34.3.3 #390123
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Changelog: https://github.com/electron/electron/releases/tag/v33.4.5 - Diff: electron/electron@refs/tags/v33.4.3...v33.4.5 (cherry picked from commit c384a1a)
- Changelog: https://github.com/electron/electron/releases/tag/v33.4.5 - Diff: electron/electron@refs/tags/v33.4.3...v33.4.5 (cherry picked from commit 79246b8)
- Changelog: https://github.com/electron/electron/releases/tag/v33.4.5 - Diff: electron/electron@refs/tags/v33.4.3...v33.4.5 (cherry picked from commit a4575e7)
- Changelog: https://github.com/electron/electron/releases/tag/v34.3.3 - Diff: electron/electron@refs/tags/v34.3.2...v34.3.3 (cherry picked from commit 30b8a3e)
- Changelog: https://github.com/electron/electron/releases/tag/v34.3.3 - Diff: electron/electron@refs/tags/v34.3.2...v34.3.3 (cherry picked from commit 59f009a)
- Changelog: https://github.com/electron/electron/releases/tag/v34.3.3 - Diff: electron/electron@refs/tags/v34.3.2...v34.3.3 (cherry picked from commit e8d42eb)
yuyuyureka
changed the title
13 tasks
|
Here are the diffs between the main PR diffs and the backport diffs: --- 389784.patch 2025-03-15 15:20:52.071763223 +0100
+++ 390123.patch 2025-03-15 15:20:40.997869400 +0100
@@ -1,19 +1,21 @@
-From d489c31ce3d235b9b5006d0aaef664a0ea407d31 Mon Sep 17 00:00:00 2001
+From db9e4ef9a4791e611d089e88b14867dbd5d423d6 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 14 Mar 2025 10:41:14 +0100
Subject: [PATCH 1/6] electron_33-bin: 33.4.3 -> 33.4.5
- Changelog: https://github.com/electron/electron/releases/tag/v33.4.5
- Diff: https://github.com/electron/electron/compare/refs/tags/v33.4.3...v33.4.5
+
+(cherry picked from commit c384a1a10ab0c368de1d8a7b2e62209d1eab44bc)
---
pkgs/development/tools/electron/binary/info.json | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
-index c37e344c5c06b7..5a731a8906704a 100644
+index 81ffa30b2d1e04..54dec58959529c 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
-@@ -12,14 +12,14 @@
+@@ -78,14 +78,14 @@
},
"33": {
"hashes": {
@@ -36,22 +38,24 @@
"34": {
"hashes": {
-From 40c39898896e0401cec01b69300373eb086d823d Mon Sep 17 00:00:00 2001
+From d0a63cb7c8188adc6327f6c0257ca804bc5f6625 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 14 Mar 2025 10:41:19 +0100
Subject: [PATCH 2/6] electron-chromedriver_33: 33.4.3 -> 33.4.5
- Changelog: https://github.com/electron/electron/releases/tag/v33.4.5
- Diff: https://github.com/electron/electron/compare/refs/tags/v33.4.3...v33.4.5
+
+(cherry picked from commit 79246b80432a79ecf838eec0446253614e576abe)
---
.../tools/electron/chromedriver/info.json | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
-index 193256bbcd8225..42b6d7f4ccebb8 100644
+index 176b6c14b1b21d..d30c1a31686a1d 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
-@@ -12,14 +12,14 @@
+@@ -45,14 +45,14 @@
},
"33": {
"hashes": {
@@ -74,19 +78,21 @@
"34": {
"hashes": {
-From be056cd2e33790ba6d22a772dcedeb30987c7311 Mon Sep 17 00:00:00 2001
+From 9c14456d467de3fe470fcd60647fc52582272208 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 14 Mar 2025 11:11:21 +0100
Subject: [PATCH 3/6] electron-source.electron_33: 33.4.3 -> 33.4.5
- Changelog: https://github.com/electron/electron/releases/tag/v33.4.5
- Diff: https://github.com/electron/electron/compare/refs/tags/v33.4.3...v33.4.5
+
+(cherry picked from commit a4575e70640cd8bd85ca2be8ad769a3ef9936dcd)
---
pkgs/development/tools/electron/info.json | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
-index 0f2d243135b291..74264d69f11501 100644
+index e162e6ca1d06dc..74264d69f11501 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -17,7 +17,7 @@
@@ -115,28 +121,30 @@
"electron_yarn_hash": "0bzsswcg62b39xinq5vikk7qz7d15276s2vc15v1gcb5wvh05ff8",
"modules": "130",
"node": "20.18.3",
-- "version": "33.4.3"
+- "version": "33.4.2"
+ "version": "33.4.5"
},
"34": {
"chrome": "132.0.6834.210",
-From 259916fe8f23a8a7f362644ae6b97062528b0fe4 Mon Sep 17 00:00:00 2001
+From 0d910d14947e9c70ad7af972a70dd10ce27f4e0a Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 14 Mar 2025 12:46:22 +0100
Subject: [PATCH 4/6] electron_34-bin: 34.3.2 -> 34.3.3
- Changelog: https://github.com/electron/electron/releases/tag/v34.3.3
- Diff: https://github.com/electron/electron/compare/refs/tags/v34.3.2...v34.3.3
+
+(cherry picked from commit 30b8a3e7804fc725b412c84b09db6d046398e223)
---
pkgs/development/tools/electron/binary/info.json | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
-index 5a731a8906704a..dac8811379d7d3 100644
+index 54dec58959529c..1eec101924e574 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
-@@ -23,13 +23,13 @@
+@@ -89,13 +89,13 @@
},
"34": {
"hashes": {
@@ -158,22 +166,24 @@
}
}
-From 34874aaa723612b266e1738af2ef1b1a5b59755c Mon Sep 17 00:00:00 2001
+From 3d71b58a634da22eb6c78f124291ebd256e0b85c Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 14 Mar 2025 12:46:25 +0100
Subject: [PATCH 5/6] electron-chromedriver_34: 34.3.2 -> 34.3.3
- Changelog: https://github.com/electron/electron/releases/tag/v34.3.3
- Diff: https://github.com/electron/electron/compare/refs/tags/v34.3.2...v34.3.3
+
+(cherry picked from commit 59f009abe079eac8cddbcc6bac48aabc50692d2d)
---
.../tools/electron/chromedriver/info.json | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
-index 42b6d7f4ccebb8..944a0cd05b8f8b 100644
+index d30c1a31686a1d..b7739c1d4532c6 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
-@@ -23,13 +23,13 @@
+@@ -56,13 +56,13 @@
},
"34": {
"hashes": {
@@ -195,13 +205,15 @@
}
}
-From e35e3e2da69306c781fbb78fc64c9154f664c513 Mon Sep 17 00:00:00 2001
+From 598f1796a4934d175e7c96ab88823ff7e35f0a1d Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 14 Mar 2025 12:46:45 +0100
Subject: [PATCH 6/6] electron-source.electron_34: 34.3.2 -> 34.3.3
- Changelog: https://github.com/electron/electron/releases/tag/v34.3.3
- Diff: https://github.com/electron/electron/compare/refs/tags/v34.3.2...v34.3.3
+
+(cherry picked from commit e8d42eb913133c376b6035b67275c69a59010ee6)
---
pkgs/development/tools/electron/info.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)The only actual difference seems to be -- "version": "33.4.3"
+- "version": "33.4.2" |
|
I wonder what happened to the CI checks, that it's failing |
It seems #389200, specifically electron-source.electron_33: 33.4.2 -> 33.4.3 contained a mistake where it included the src bump, but kept the old version number |
|
Built electron_33 and electron_34 on aarch64-linux |
|
The CI stays broken despite re-runs |
|
@TomaSajt can you clarify what is missing for you to approve or merge this PR? If you want to be safe about the CI, I can open a new PR based on a new branch name, which should resolve the current CI issue. |
|
Sorry, it just slipped my mind. Diffs are looking fine. Will merge soon. |
TomaSajt
approved these changes
Mar 19, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.