From e47b66a4cdad5a519f3bd721115538f97d00260f Mon Sep 17 00:00:00 2001
From: Olivier John Ndjike Nzia <olivier.ndjikenzia@datadoghq.com>
Date: Thu, 14 May 2026 10:31:44 -0500
Subject: [PATCH 1/3] upgrade gitlab to node 24

---
 .gitlab/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab/Dockerfile b/.gitlab/Dockerfile
index f5b6dc0..9ca5edc 100644
--- a/.gitlab/Dockerfile
+++ b/.gitlab/Dockerfile
@@ -12,7 +12,7 @@ RUN apt-get install ruby-full -y
 # Install NodeJS 18.x
 RUN mkdir -p /etc/apt/keyrings
 RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
-RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
+RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_24.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
 RUN apt-get update && apt-get install -y nodejs
 
 # Install Yarn and Typescript globally

From 7feb3b4da8428c896994c8e53cb7af37f641f6e9 Mon Sep 17 00:00:00 2001
From: Olivier John Ndjike Nzia <olivier.ndjikenzia@datadoghq.com>
Date: Thu, 14 May 2026 12:35:48 -0500
Subject: [PATCH 2/3] run ci image job

---
 .gitlab-ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1b274c4..31b0dba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,11 +14,11 @@ ci image:
     DDSIGN_ID_TOKEN:
       aud: image-integrity
   needs: []
-  rules:
-    - if: '$CI_COMMIT_BRANCH == "main" && $CI_PIPELINE_SOURCE == "push"'
-      changes:
-        - .gitlab/Dockerfile
-      when: on_success
+  # rules:
+  #   - if: '$CI_COMMIT_BRANCH == "main" && $CI_PIPELINE_SOURCE == "push"'
+  #     changes:
+  #       - .gitlab/Dockerfile
+  #     when: on_success
   variables:
     DOCKER_TARGET: ${DOCKER_TARGET_IMAGE}:${DOCKER_TARGET_VERSION}
   script:

From 47e77728a19dccb8d623d9f0d9aa9778f5d1344f Mon Sep 17 00:00:00 2001
From: Olivier John Ndjike Nzia <olivier.ndjikenzia@datadoghq.com>
Date: Thu, 14 May 2026 13:05:22 -0500
Subject: [PATCH 3/3] add back ci image rule

---
 .gitlab-ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 31b0dba..1b274c4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,11 +14,11 @@ ci image:
     DDSIGN_ID_TOKEN:
       aud: image-integrity
   needs: []
-  # rules:
-  #   - if: '$CI_COMMIT_BRANCH == "main" && $CI_PIPELINE_SOURCE == "push"'
-  #     changes:
-  #       - .gitlab/Dockerfile
-  #     when: on_success
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "main" && $CI_PIPELINE_SOURCE == "push"'
+      changes:
+        - .gitlab/Dockerfile
+      when: on_success
   variables:
     DOCKER_TARGET: ${DOCKER_TARGET_IMAGE}:${DOCKER_TARGET_VERSION}
   script: