From 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 19 Apr 2024 03:13:33 +0200
Subject: Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 taskcluster/ci/toolchain/node.yml | 55 +++++++--------------------------------
 1 file changed, 10 insertions(+), 45 deletions(-)

(limited to 'taskcluster/ci/toolchain/node.yml')

diff --git a/taskcluster/ci/toolchain/node.yml b/taskcluster/ci/toolchain/node.yml
index c1bc86254d..6ab3511aab 100644
--- a/taskcluster/ci/toolchain/node.yml
+++ b/taskcluster/ci/toolchain/node.yml
@@ -20,16 +20,6 @@ linux64-node-12:
         fetch:
             - nodejs-12-linux64
 
-linux64-node-16:
-    treeherder:
-        symbol: TL(node-16)
-    run:
-        toolchain-alias:
-            - linux64-node
-    fetches:
-        fetch:
-            - nodejs-16-linux64
-
 linux64-node-18:
     # The upstream prebuilt binary requires glibc 2.28, which is too recent for Ubuntu 18.04,
     # so we build our own that won't have that requirement.
@@ -38,6 +28,8 @@ linux64-node-18:
         symbol: TL(node-18)
     run:
         script: build-nodejs.sh
+        toolchain-alias:
+            - linux64-node
     fetches:
         fetch:
             - nodejs-18-source
@@ -45,70 +37,43 @@ linux64-node-18:
             - linux64-gcc-11
             - linux64-toolchain-sysroot
 
-macosx64-node-16:
+macosx64-node-18:
     treeherder:
-        symbol: TM(node-16)
+        symbol: TM(node-18)
     run:
         toolchain-alias:
             - macosx64-node
-    fetches:
-        fetch:
-            - nodejs-16-macosx64
 
-macosx64-node-18:
-    treeherder:
-        symbol: TM(node-18)
     fetches:
         fetch:
             - nodejs-18-macosx64
 
-macosx64-aarch64-node-16:
+macosx64-aarch64-node-18:
     treeherder:
-        symbol: TM(node-16-arm64)
+        symbol: TM(node-18-arm64)
     run:
         toolchain-alias:
             - macosx64-aarch64-node
-    fetches:
-        fetch:
-            - nodejs-16-macosx64-arm64
-
-macosx64-aarch64-node-18:
-    treeherder:
-        symbol: TM(node-18-arm64)
     fetches:
         fetch:
             - nodejs-18-macosx64-arm64
 
-win64-node-16:
+win64-node-18:
     treeherder:
-        symbol: TW64(node-16)
+        symbol: TW64(node-18)
     run:
         toolchain-alias:
             - win64-node
-    fetches:
-        fetch:
-            - nodejs-16-win64
-
-win64-node-18:
-    treeherder:
-        symbol: TW64(node-18)
     fetches:
         fetch:
             - nodejs-18-win64
 
-win32-node-16:
+win32-node-18:
     treeherder:
-        symbol: TW32(node-16)
+        symbol: TW32(node-18)
     run:
         toolchain-alias:
             - win32-node
-    fetches:
-        fetch:
-            - nodejs-16-win32
-
-win32-node-18:
-    treeherder:
-        symbol: TW32(node-18)
     fetches:
         fetch:
             - nodejs-18-win32
-- 
cgit v1.2.3