From 41ed6ab3646c6c8a154e5e3c1c8f5ea4d315926e Mon Sep 17 00:00:00 2001
From: Henry Heino <46334387+personalizedrefrigerator@users.noreply.github.com>
Date: Sat, 15 Nov 2025 00:55:45 -0800
Subject: [PATCH] Chore: CI: Upgrade NodeJS to v24 (#13700)

---
 .github/workflows/build-android.yml                         | 4 ++--
 .github/workflows/build-macos-m1.yml                        | 6 ++----
 .github/workflows/github-actions-main.yml                   | 4 ++--
 .github/workflows/shared/setup-build-environment/action.yml | 4 ++--
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
index 6964c1c576..ef77c70fcc 100644
--- a/.github/workflows/build-android.yml
+++ b/.github/workflows/build-android.yml
@@ -21,9 +21,9 @@ jobs:
           
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
-          node-version: '18'
+          node-version: '24'
           cache: 'yarn'
 
       - name: Install Yarn
diff --git a/.github/workflows/build-macos-m1.yml b/.github/workflows/build-macos-m1.yml
index 8ffbf61c8d..5fcd6029e5 100644
--- a/.github/workflows/build-macos-m1.yml
+++ b/.github/workflows/build-macos-m1.yml
@@ -9,11 +9,9 @@ jobs:
 
       - uses: actions/checkout@v4
       - uses: olegtarasov/get-tag@v2.1.4
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
-          # We need to pin the version to 18.15, because 18.16+ fails with this error:
-          # https://github.com/facebook/react-native/issues/36440
-          node-version: '18.20.8'
+          node-version: '24'
           cache: 'yarn'
 
       - name: Install Yarn
diff --git a/.github/workflows/github-actions-main.yml b/.github/workflows/github-actions-main.yml
index de4904a5ec..18436de3c1 100644
--- a/.github/workflows/github-actions-main.yml
+++ b/.github/workflows/github-actions-main.yml
@@ -147,9 +147,9 @@ jobs:
 
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
-          node-version: '18'
+          node-version: '24'
 
       - name: Free disk space
         if: runner.os == 'Linux'
diff --git a/.github/workflows/shared/setup-build-environment/action.yml b/.github/workflows/shared/setup-build-environment/action.yml
index 0b6805edfd..805d0e6335 100644
--- a/.github/workflows/shared/setup-build-environment/action.yml
+++ b/.github/workflows/shared/setup-build-environment/action.yml
@@ -51,9 +51,9 @@ runs:
     - uses: dtolnay/rust-toolchain@stable
       if: ${{ runner.os != 'Windows' }}
 
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v6
       with:
-        node-version: '18.20.8'
+        node-version: '24'
         # Disable the cache on ARM runners. For now, we don't run "yarn install" on these
         # environments and this breaks actions/setup-node.
         # See https://github.com/laurent22/joplin/commit/47d0d3eb9e89153a609fb5441344da10904c6308#commitcomment-159577783.