From 7df3e999bc2ef689674d961d32232d03486dab3b Mon Sep 17 00:00:00 2001
From: Ben Wilson <ben.wilson@smartbear.com>
Date: Wed, 25 Jun 2025 17:09:44 +0100
Subject: [PATCH 1/5] test: :white_check_mark: update versions of electron
 tested to match electron support

---
 .buildkite/basic/electron-pipeline.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.buildkite/basic/electron-pipeline.yml b/.buildkite/basic/electron-pipeline.yml
index 7881c2685d..ad7ec0f27b 100644
--- a/.buildkite/basic/electron-pipeline.yml
+++ b/.buildkite/basic/electron-pipeline.yml
@@ -15,13 +15,14 @@ steps:
       matrix:
         setup:
           electron_version:
-            - "^20.0.0"
-            - "^24.0.0"
-            - "^26.0.0"
-            - "^28.0.0"
-            - "^30.0.0"
+            - "^37.0.0" # Latest Version
+            - "^36.0.0" # EOL 2025-Oct-28
           node_version:
-            - "18"
+            - "22"
+          adjustments:
+            - with:
+              electron_version: "^34.0.0" # EOL 2025-Jun-24
+              node_version: "20"
       commands:
         - echo "Running on Node `node -v`"
         - npm install electron@${ELECTRON_VERSION} --no-audit --progress=false --no-save

From 54f2a2c54172085c9524eed8c8632c9bedd6f63e Mon Sep 17 00:00:00 2001
From: Ben Wilson <ben.wilson@smartbear.com>
Date: Wed, 25 Jun 2025 17:24:48 +0100
Subject: [PATCH 2/5] fix indentation

---
 .buildkite/basic/electron-pipeline.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.buildkite/basic/electron-pipeline.yml b/.buildkite/basic/electron-pipeline.yml
index ad7ec0f27b..42819bffd3 100644
--- a/.buildkite/basic/electron-pipeline.yml
+++ b/.buildkite/basic/electron-pipeline.yml
@@ -19,8 +19,8 @@ steps:
             - "^36.0.0" # EOL 2025-Oct-28
           node_version:
             - "22"
-          adjustments:
-            - with:
+        adjustments:
+          - with:
               electron_version: "^34.0.0" # EOL 2025-Jun-24
               node_version: "20"
       commands:

From 172e9df1c5b5f8d0cfc537efe6458a3a4bfd29f6 Mon Sep 17 00:00:00 2001
From: Ben Wilson <ben.wilson@smartbear.com>
Date: Wed, 25 Jun 2025 18:14:17 +0100
Subject: [PATCH 3/5] add version 35

---
 .buildkite/basic/electron-pipeline.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.buildkite/basic/electron-pipeline.yml b/.buildkite/basic/electron-pipeline.yml
index 42819bffd3..b4ecdecafb 100644
--- a/.buildkite/basic/electron-pipeline.yml
+++ b/.buildkite/basic/electron-pipeline.yml
@@ -17,6 +17,7 @@ steps:
           electron_version:
             - "^37.0.0" # Latest Version
             - "^36.0.0" # EOL 2025-Oct-28
+            - "^35.0.0" # EOL 2025-Sep-02
           node_version:
             - "22"
         adjustments:

From 61d0ce256539fcfbfd9cfc4e2e09286bd1cbfabe Mon Sep 17 00:00:00 2001
From: Ben Wilson <ben.wilson@smartbear.com>
Date: Thu, 18 Sep 2025 09:22:14 +0100
Subject: [PATCH 4/5] update version matrix

---
 .buildkite/basic/electron-pipeline.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/.buildkite/basic/electron-pipeline.yml b/.buildkite/basic/electron-pipeline.yml
index b4ecdecafb..c43370d062 100644
--- a/.buildkite/basic/electron-pipeline.yml
+++ b/.buildkite/basic/electron-pipeline.yml
@@ -15,15 +15,22 @@ steps:
       matrix:
         setup:
           electron_version:
-            - "^37.0.0" # Latest Version
+            - "^38.0.0" # Latest Version
+            - "^37.0.0" # EOL 2026-Jan-13
             - "^36.0.0" # EOL 2025-Oct-28
-            - "^35.0.0" # EOL 2025-Sep-02
+            - "^34.0.0" # EOL 2025-Jun-24
           node_version:
             - "22"
         adjustments:
           - with:
               electron_version: "^34.0.0" # EOL 2025-Jun-24
               node_version: "20"
+          - with:
+              electron_version: "^32.0.0" # EOL 2025-Mar-04
+              node_version: "20"
+          - with:
+              electron_version: "^30.0.0" # EOL 2024-Oct-15
+              node_version: "20"
       commands:
         - echo "Running on Node `node -v`"
         - npm install electron@${ELECTRON_VERSION} --no-audit --progress=false --no-save

From 47f65149710e9e87ffe1cc2813407aee4fc834ec Mon Sep 17 00:00:00 2001
From: Ben Wilson <ben.wilson@smartbear.com>
Date: Thu, 18 Sep 2025 09:24:49 +0100
Subject: [PATCH 5/5] remove duplicate from version matrix

---
 .buildkite/basic/electron-pipeline.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.buildkite/basic/electron-pipeline.yml b/.buildkite/basic/electron-pipeline.yml
index c43370d062..f7011f5b19 100644
--- a/.buildkite/basic/electron-pipeline.yml
+++ b/.buildkite/basic/electron-pipeline.yml
@@ -18,7 +18,6 @@ steps:
             - "^38.0.0" # Latest Version
             - "^37.0.0" # EOL 2026-Jan-13
             - "^36.0.0" # EOL 2025-Oct-28
-            - "^34.0.0" # EOL 2025-Jun-24
           node_version:
             - "22"
         adjustments: