From 0414363385dd1b3686d25fc6c7c30c5fac9e9a7b Mon Sep 17 00:00:00 2001
From: Tim Fish <tim@timfish.uk>
Date: Tue, 21 Jul 2026 14:13:21 +0100
Subject: [PATCH 1/2] test: Drop Node v18 tests

---
 .github/workflows/build.yml      | 31 ++++---------------------------
 scripts/node-v18-compat-check.js |  7 -------
 2 files changed, 4 insertions(+), 34 deletions(-)
 delete mode 100644 scripts/node-v18-compat-check.js

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4ab5a04f0014..8f288453871f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -567,7 +567,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [18, 20, 22, 24, 26]
+        node: [20.19, 22.12, 24, 26]
     steps:
       - name: Check out base commit (${{ github.event.pull_request.base.sha }})
         uses: actions/checkout@v7
@@ -793,7 +793,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [18, 20, 22, 24, 26]
+        node: [20.19, 22.12, 24, 26]
         typescript:
           - false
         use_orchestrion:
@@ -849,28 +849,6 @@ jobs:
         env:
           INJECT_ORCHESTRION: ${{ matrix.use_orchestrion }}
 
-  job_node_v18_compat:
-    name: Node v18.0.0 Compatibility Check
-    needs: [job_get_metadata, job_build]
-    if: needs.job_build.outputs.changed_node == 'true' || github.event_name != 'pull_request'
-    runs-on: ubuntu-24.04
-    timeout-minutes: 5
-    steps:
-      - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
-        uses: actions/checkout@v7
-        with:
-          ref: ${{ env.HEAD_COMMIT }}
-      - name: Set up Node
-        uses: actions/setup-node@v6
-        with:
-          node-version: '18.0.0'
-      - name: Restore caches
-        uses: ./.github/actions/restore-cache
-        with:
-          dependency_cache_key: ${{ needs.job_build.outputs.dependency_cache_key }}
-      - name: Check Node v18.0.0 compatibility
-        run: node scripts/node-v18-compat-check.js
-
   job_node_core_integration_tests:
     name:
       Node (${{ matrix.node }})${{ (matrix.typescript && format(' (TS {0})', matrix.typescript)) || '' }} Node-Core
@@ -882,7 +860,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [18, 20, 22, 24, 26]
+        node: [20.19, 22.12, 24, 26]
         typescript:
           - false
         include:
@@ -945,7 +923,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [18, 20, 22, 24, 26]
+        node: [20.19, 22.12, 24, 26]
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
         uses: actions/checkout@v7
@@ -1321,7 +1299,6 @@ jobs:
         job_deno_unit_tests,
         job_node_unit_tests,
         job_node_integration_tests,
-        job_node_v18_compat,
         job_node_core_integration_tests,
         job_cloudflare_integration_tests,
         job_bundler_plugin_integration_tests,
diff --git a/scripts/node-v18-compat-check.js b/scripts/node-v18-compat-check.js
deleted file mode 100644
index 6dc999d5034d..000000000000
--- a/scripts/node-v18-compat-check.js
+++ /dev/null
@@ -1,7 +0,0 @@
-'use strict';
-
-// Verify the Node SDK can be loaded without errors on Node v18.0.0 (the minimum supported version).
-// This catches accidental use of Node APIs that don't exist in v18.0.0.
-require('@sentry/node');
-
-console.log('Node v18.0.0 compatibility check passed');

From 98bf76eb4eb9b7a7b0eff11ff8caec51d3e1ef83 Mon Sep 17 00:00:00 2001
From: Tim Fish <tim@timfish.uk>
Date: Tue, 21 Jul 2026 15:30:27 +0100
Subject: [PATCH 2/2] Couple more fixes

---
 .github/workflows/build.yml                                  | 4 ++--
 .../test-applications/aws-serverless-layer/package.json      | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8f288453871f..5947dee1b05f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -803,9 +803,9 @@ jobs:
           - node: 24
             typescript: '3.8'
           # No need to test orchestrion for v18
-          - node: 20
+          - node: 20.19
             use_orchestrion: 'true'
-          - node: 22
+          - node: 22.12
             use_orchestrion: 'true'
           - node: 24
             use_orchestrion: 'true'
diff --git a/dev-packages/e2e-tests/test-applications/aws-serverless-layer/package.json b/dev-packages/e2e-tests/test-applications/aws-serverless-layer/package.json
index 16acf393e5d4..a12d2bba1152 100644
--- a/dev-packages/e2e-tests/test-applications/aws-serverless-layer/package.json
+++ b/dev-packages/e2e-tests/test-applications/aws-serverless-layer/package.json
@@ -36,11 +36,6 @@
         "build-command": "NODE_VERSION=22 pnpm test:build",
         "assert-command": "NODE_VERSION=22 pnpm test:assert",
         "label": "aws-serverless-layer (Node 22)"
-      },
-      {
-        "build-command": "NODE_VERSION=18 pnpm test:build",
-        "assert-command": "NODE_VERSION=18 pnpm test:assert",
-        "label": "aws-serverless-layer (Node 18)"
       }
     ]
   }