From fde88cf6ab624bfb1549e404bc73e5e0d0515098 Mon Sep 17 00:00:00 2001
From: Maarten Zuidhoorn <maarten@zuidhoorn.com>
Date: Thu, 16 Apr 2026 22:40:26 +0200
Subject: [PATCH 1/2] Drop Node.js 18, run jobs on Node.js 24

---
 .../ensure-blocking-pr-labels-absent.yml      |  2 +-
 .github/workflows/lint-build-test.yml         | 23 +++++++++----------
 .github/workflows/publish-release.yml         |  6 ++---
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ensure-blocking-pr-labels-absent.yml b/.github/workflows/ensure-blocking-pr-labels-absent.yml
index 5e0c0b68d80..14a463f0850 100644
--- a/.github/workflows/ensure-blocking-pr-labels-absent.yml
+++ b/.github/workflows/ensure-blocking-pr-labels-absent.yml
@@ -16,7 +16,7 @@ jobs:
       pull-requests: read
     steps:
       - name: Checkout and setup environment
-        uses: MetaMask/action-checkout-and-setup@v2
+        uses: MetaMask/action-checkout-and-setup@v3
         with:
           is-high-risk-environment: false
       - name: Run command
diff --git a/.github/workflows/lint-build-test.yml b/.github/workflows/lint-build-test.yml
index 4422d670ee6..4afde9144a4 100644
--- a/.github/workflows/lint-build-test.yml
+++ b/.github/workflows/lint-build-test.yml
@@ -9,12 +9,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [18.x, 20.x, 22.x]
+        node-version: [20.x, 22.x, 24.x]
     outputs:
       child-workspace-package-names: ${{ steps.workspace-package-names.outputs.child-workspace-package-names }}
     steps:
       - name: Checkout and setup environment
-        uses: MetaMask/action-checkout-and-setup@v2
+        uses: MetaMask/action-checkout-and-setup@v3
         with:
           is-high-risk-environment: false
           cache-node-modules: true
@@ -31,7 +31,6 @@ jobs:
     needs: prepare
     strategy:
       matrix:
-        node-version: [22.x]
         script:
           - lint:eslint
           - lint:misc:check
@@ -42,7 +41,7 @@ jobs:
           - readme-content:check
     steps:
       - name: Checkout and setup environment
-        uses: MetaMask/action-checkout-and-setup@v2
+        uses: MetaMask/action-checkout-and-setup@v3
         with:
           is-high-risk-environment: false
           node-version: ${{ matrix.node-version }}
@@ -64,11 +63,11 @@ jobs:
     needs: prepare
     strategy:
       matrix:
-        node-version: [22.x]
+        node-version: [24.x]
         package-name: ${{ fromJson(needs.prepare.outputs.child-workspace-package-names) }}
     steps:
       - name: Checkout and setup environment
-        uses: MetaMask/action-checkout-and-setup@v2
+        uses: MetaMask/action-checkout-and-setup@v3
         with:
           is-high-risk-environment: false
           node-version: ${{ matrix.node-version }}
@@ -97,10 +96,10 @@ jobs:
     needs: prepare
     strategy:
       matrix:
-        node-version: [22.x]
+        node-version: [24.x]
     steps:
       - name: Checkout and setup environment
-        uses: MetaMask/action-checkout-and-setup@v2
+        uses: MetaMask/action-checkout-and-setup@v3
         with:
           is-high-risk-environment: false
           node-version: ${{ matrix.node-version }}
@@ -119,10 +118,10 @@ jobs:
     needs: prepare
     strategy:
       matrix:
-        node-version: [22.x]
+        node-version: [24.x]
     steps:
       - name: Checkout and setup environment
-        uses: MetaMask/action-checkout-and-setup@v2
+        uses: MetaMask/action-checkout-and-setup@v3
         with:
           is-high-risk-environment: false
           node-version: ${{ matrix.node-version }}
@@ -141,11 +140,11 @@ jobs:
     needs: prepare
     strategy:
       matrix:
-        node-version: [18.x, 20.x, 22.x]
+        node-version: [20.x, 22.x, 24.x]
         package-name: ${{ fromJson(needs.prepare.outputs.child-workspace-package-names) }}
     steps:
       - name: Checkout and setup environment
-        uses: MetaMask/action-checkout-and-setup@v2
+        uses: MetaMask/action-checkout-and-setup@v3
         with:
           is-high-risk-environment: false
           node-version: ${{ matrix.node-version }}
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index 0f1fbf28c28..11016bf54c9 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout and setup environment
-        uses: MetaMask/action-checkout-and-setup@v2
+        uses: MetaMask/action-checkout-and-setup@v3
         with:
           is-high-risk-environment: true
       - uses: MetaMask/action-publish-release@v3
@@ -38,7 +38,7 @@ jobs:
     needs: publish-release
     steps:
       - name: Checkout and setup environment
-        uses: MetaMask/action-checkout-and-setup@v2
+        uses: MetaMask/action-checkout-and-setup@v3
         with:
           is-high-risk-environment: true
           ref: ${{ github.sha }}
@@ -59,7 +59,7 @@ jobs:
     needs: publish-npm-dry-run
     steps:
       - name: Checkout and setup environment
-        uses: MetaMask/action-checkout-and-setup@v2
+        uses: MetaMask/action-checkout-and-setup@v3
         with:
           is-high-risk-environment: true
           ref: ${{ github.sha }}

From 181491370990559f345b97f6cdd9460b1a7e0dfe Mon Sep 17 00:00:00 2001
From: Maarten Zuidhoorn <maarten@zuidhoorn.com>
Date: Thu, 16 Apr 2026 22:43:44 +0200
Subject: [PATCH 2/2] Readd missing node-version

---
 .github/workflows/lint-build-test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/lint-build-test.yml b/.github/workflows/lint-build-test.yml
index 4afde9144a4..cc51350311e 100644
--- a/.github/workflows/lint-build-test.yml
+++ b/.github/workflows/lint-build-test.yml
@@ -31,6 +31,7 @@ jobs:
     needs: prepare
     strategy:
       matrix:
+        node-version: [24.x]
         script:
           - lint:eslint
           - lint:misc:check