Skip to content

Commit 03d635c

Browse files
committed
Bug 1879466 - Add node 18 toolchains. r=firefox-build-system-reviewers,sergesanspaille
Differential Revision: https://phabricator.services.mozilla.com/D201186
1 parent bbd30d2 commit 03d635c

File tree

3 files changed

+119
-0
lines changed

3 files changed

+119
-0
lines changed

taskcluster/ci/fetch/toolchains.yml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,17 @@ nodejs-16-macosx64:
507507
strip-components: 1
508508
add-prefix: node/
509509

510+
nodejs-18-macosx64:
511+
description: nodejs 18 for x64 macOS
512+
fetch:
513+
type: static-url
514+
url: https://nodejs.org/dist/v18.19.0/node-v18.19.0-darwin-x64.tar.xz
515+
sha256: 4f60b40071c6a67482b99d22a5265839177b8706a2b13b493396f368f0b42b00
516+
size: 22496376
517+
artifact-name: nodejs.tar.zst
518+
strip-components: 1
519+
add-prefix: node/
520+
510521
nodejs-16-macosx64-arm64:
511522
description: nodejs 16 for arm64 macOS
512523
fetch:
@@ -518,6 +529,17 @@ nodejs-16-macosx64-arm64:
518529
strip-components: 1
519530
add-prefix: node/
520531

532+
nodejs-18-macosx64-arm64:
533+
description: nodejs 18 for arm64 macOS
534+
fetch:
535+
type: static-url
536+
url: https://nodejs.org/dist/v18.19.0/node-v18.19.0-darwin-arm64.tar.xz
537+
sha256: 857885257c586fb13c93d33d326ca82056ba8b7445ce27cf34dd406add04158e
538+
size: 20768464
539+
artifact-name: nodejs.tar.zst
540+
strip-components: 1
541+
add-prefix: node/
542+
521543
nodejs-16-win32:
522544
description: nodejs 16 for x86 Windows
523545
fetch:
@@ -529,6 +551,17 @@ nodejs-16-win32:
529551
strip-components: 1
530552
add-prefix: node/
531553

554+
nodejs-18-win32:
555+
description: nodejs 18 for x86 Windows
556+
fetch:
557+
type: static-url
558+
url: https://nodejs.org/dist/v18.19.0/node-v18.19.0-win-x86.zip
559+
sha256: 3171148f735954bdca8adccb2200379e61142e0f5a2bdb4ca6432afb0d9951df
560+
size: 27504941
561+
artifact-name: nodejs.tar.zst
562+
strip-components: 1
563+
add-prefix: node/
564+
532565
nodejs-16-win64:
533566
description: nodejs 16 for x64 Windows
534567
fetch:
@@ -540,6 +573,28 @@ nodejs-16-win64:
540573
strip-components: 1
541574
add-prefix: node/
542575

576+
nodejs-18-win64:
577+
description: nodejs 18 for x64 Windows
578+
fetch:
579+
type: static-url
580+
url: https://nodejs.org/dist/v18.19.0/node-v18.19.0-win-x64.zip
581+
sha256: 5311913d45e1fcc3643c58d1e3926eb85437b180f025fe5857413c9f02403645
582+
size: 29332158
583+
artifact-name: nodejs.tar.zst
584+
strip-components: 1
585+
add-prefix: node/
586+
587+
nodejs-18-source:
588+
description: nodejs 18 source
589+
fetch:
590+
type: static-url
591+
url: https://nodejs.org/dist/v18.19.0/node-v18.19.0.tar.xz
592+
sha256: f52b41af20596a9abd8ed75241837ec43945468221448bbf841361e2091819b6
593+
size: 41248748
594+
artifact-name: nodejs.tar.zst
595+
strip-components: 1
596+
add-prefix: node/
597+
543598
gnumake:
544599
description: GNU make source
545600
fetch:

taskcluster/ci/toolchain/node.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,21 @@ linux64-node-16:
3030
fetch:
3131
- nodejs-16-linux64
3232

33+
linux64-node-18:
34+
# The upstream prebuilt binary requires glibc 2.28, which is too recent for Ubuntu 18.04,
35+
# so we build our own that won't have that requirement.
36+
description: "Node toolchain build"
37+
treeherder:
38+
symbol: TL(node-18)
39+
run:
40+
script: build-nodejs.sh
41+
fetches:
42+
fetch:
43+
- nodejs-18-source
44+
toolchain:
45+
- linux64-clang-toolchain
46+
- linux64-toolchain-sysroot
47+
3348
macosx64-node-16:
3449
treeherder:
3550
symbol: TM(node-16)
@@ -40,6 +55,13 @@ macosx64-node-16:
4055
fetch:
4156
- nodejs-16-macosx64
4257

58+
macosx64-node-18:
59+
treeherder:
60+
symbol: TM(node-18)
61+
fetches:
62+
fetch:
63+
- nodejs-18-macosx64
64+
4365
macosx64-aarch64-node-16:
4466
treeherder:
4567
symbol: TM(node-16-arm64)
@@ -50,6 +72,13 @@ macosx64-aarch64-node-16:
5072
fetch:
5173
- nodejs-16-macosx64-arm64
5274

75+
macosx64-aarch64-node-18:
76+
treeherder:
77+
symbol: TM(node-18-arm64)
78+
fetches:
79+
fetch:
80+
- nodejs-18-macosx64-arm64
81+
5382
win64-node-16:
5483
treeherder:
5584
symbol: TW64(node-16)
@@ -60,6 +89,13 @@ win64-node-16:
6089
fetch:
6190
- nodejs-16-win64
6291

92+
win64-node-18:
93+
treeherder:
94+
symbol: TW64(node-18)
95+
fetches:
96+
fetch:
97+
- nodejs-18-win64
98+
6399
win32-node-16:
64100
treeherder:
65101
symbol: TW32(node-16)
@@ -69,3 +105,10 @@ win32-node-16:
69105
fetches:
70106
fetch:
71107
- nodejs-16-win32
108+
109+
win32-node-18:
110+
treeherder:
111+
symbol: TW32(node-18)
112+
fetches:
113+
fetch:
114+
- nodejs-18-win32
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#!/bin/bash
2+
set -x -e -v
3+
4+
artifact=$(basename "$TOOLCHAIN_ARTIFACT")
5+
project=${artifact%.tar.*}
6+
workspace=$HOME/workspace
7+
8+
cd $MOZ_FETCHES_DIR/$project
9+
10+
for compiler in clang clang++; do
11+
echo "#!/bin/sh" > $compiler
12+
echo "$MOZ_FETCHES_DIR/clang/bin/$compiler --sysroot=$MOZ_FETCHES_DIR/sysroot \"\$@\"" >> $compiler
13+
chmod +x $compiler
14+
done
15+
16+
CC=$PWD/clang CXX=$PWD/clang++ ./configure --verbose --prefix=/
17+
make -j$(nproc) install DESTDIR=$workspace/$project
18+
19+
tar -C $workspace -acvf $artifact $project
20+
mkdir -p $UPLOAD_DIR
21+
mv $artifact $UPLOAD_DIR

0 commit comments

Comments
 (0)