From 04124e1d8e59fd5f6649906ec0a0c3e406fd7a5e Mon Sep 17 00:00:00 2001
From: Nat Dean-Lewis <nat.dean-lewis@softwire.com>
Date: Fri, 17 Apr 2026 16:54:35 +0100
Subject: [PATCH] CLDC-4229: upgrade ruby and node at the same tiem

---
 .github/workflows/run_tests.yml | 14 +++++++-------
 .ruby-version                   |  2 +-
 Dockerfile                      |  2 +-
 Gemfile                         |  2 +-
 package.json                    |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
index fde032a69..5038a2084 100644
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -59,7 +59,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           cache: yarn
-          node-version: 20
+          node-version: 22
 
       # This is temporary to fix flaky parallel tests due to `secret_key_base` being read before it's set
       - name: Create local secret
@@ -122,7 +122,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           cache: yarn
-          node-version: 20
+          node-version: 22
 
       - name: Create database
         run: |
@@ -180,7 +180,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           cache: yarn
-          node-version: 20
+          node-version: 22
 
       - name: Create database
         run: |
@@ -239,7 +239,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           cache: yarn
-          node-version: 20
+          node-version: 22
 
       - name: Create local secret
         run: |
@@ -302,7 +302,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           cache: yarn
-          node-version: 20
+          node-version: 22
 
       - name: Create local secret
         run: |
@@ -365,7 +365,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           cache: yarn
-          node-version: 20
+          node-version: 22
 
       - name: Create database
         run: |
@@ -396,7 +396,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           cache: yarn
-          node-version: 20
+          node-version: 22
 
       - name: Install packages and symlink local dependencies
         run: |
diff --git a/.ruby-version b/.ruby-version
index f9892605c..7bcbb3808 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.4.4
+3.4.9
diff --git a/Dockerfile b/Dockerfile
index 208c994e1..0fb01f7a7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.4.4-alpine3.22 as base
+FROM ruby:3.4.9-alpine3.23 as base
 
 WORKDIR /app
 
diff --git a/Gemfile b/Gemfile
index 91ed6c8a8..c76a48bec 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby "3.4.4"
+ruby "3.4.9"
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main'
 gem "rails", "~> 7.2.2"
diff --git a/package.json b/package.json
index 6023113e1..73a11e1be 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "data-collector",
   "private": true,
   "engines": {
-    "node": "^20.0.0 || ^22.0.0"
+    "node": "^22.0.0"
   },
   "dependencies": {
     "@babel/core": "^7.17.7",