Skip to content

Commit 3a20f40

Browse files
committed
chore: remove node16 + node18 testing
1 parent 38357c6 commit 3a20f40

File tree

10 files changed

+36
-58
lines changed

10 files changed

+36
-58
lines changed

MODULE.bazel

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -96,20 +96,6 @@ node_dev = use_extension(
9696
"node",
9797
dev_dependency = True,
9898
)
99-
use_repo(node_dev, "node16_linux_amd64")
100-
use_repo(node_dev, "node16_darwin_arm64")
101-
use_repo(node_dev, "node16_darwin_amd64")
102-
use_repo(node_dev, "node16_linux_arm64")
103-
use_repo(node_dev, "node16_linux_s390x")
104-
use_repo(node_dev, "node16_linux_ppc64le")
105-
use_repo(node_dev, "node16_windows_amd64")
106-
use_repo(node_dev, "node18_linux_amd64")
107-
use_repo(node_dev, "node18_darwin_arm64")
108-
use_repo(node_dev, "node18_darwin_amd64")
109-
use_repo(node_dev, "node18_linux_arm64")
110-
use_repo(node_dev, "node18_linux_s390x")
111-
use_repo(node_dev, "node18_linux_ppc64le")
112-
use_repo(node_dev, "node18_windows_amd64")
11399
use_repo(node_dev, "node20_linux_amd64")
114100
use_repo(node_dev, "node20_darwin_arm64")
115101
use_repo(node_dev, "node20_darwin_amd64")
@@ -131,15 +117,11 @@ use_repo(node_dev, "node24_linux_arm64")
131117
use_repo(node_dev, "node24_linux_s390x")
132118
use_repo(node_dev, "node24_linux_ppc64le")
133119
use_repo(node_dev, "node24_windows_amd64")
134-
node_dev.toolchain(node_version = "18.20.4")
135-
node_dev.toolchain(
136-
name = "node16",
137-
node_version = "16.20.0",
138-
)
139-
node_dev.toolchain(
140-
name = "node18",
141-
node_version = "18.20.4",
142-
)
120+
121+
# default name+version
122+
node_dev.toolchain()
123+
124+
# additional custom name+versions
143125
node_dev.toolchain(
144126
name = "node20",
145127
node_version = "20.17.0",
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
const assert = require('assert')
22
const child_process = require('child_process')
33
const npmVersion = child_process.execSync('npm --version').toString().trim()
4-
assert.equal(npmVersion, '10.7.0')
4+
assert.equal(npmVersion, '10.8.2')

js/private/test/BUILD.bazel

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -72,32 +72,26 @@ if (parseInt(process.version.slice(1)) !== parseInt(process.argv[2])) {
7272

7373
js_test(
7474
name = "main_default_toolchain",
75-
args = ["18"],
76-
entry_point = "binary_version.js",
77-
)
78-
79-
js_test(
80-
name = "main_toolchain_18",
81-
args = ["18"],
82-
entry_point = "binary_version.js",
83-
# using the select statement will download toolchains for all three platforms
84-
# you can also just provide an individual toolchain if you don't want to download them all
85-
node_toolchain = select({
86-
"@bazel_tools//src/conditions:linux_x86_64": "@node18_linux_amd64//:node_toolchain",
87-
"@bazel_tools//src/conditions:darwin": "@node18_darwin_amd64//:node_toolchain",
88-
"@bazel_tools//src/conditions:windows": "@node18_windows_amd64//:node_toolchain",
89-
}),
90-
)
91-
92-
js_test(
93-
name = "main_toolchain_20",
9475
args = ["20"],
9576
entry_point = "binary_version.js",
96-
# using the select statement will download toolchains for all three platforms
97-
# you can also just provide an individual toolchain if you don't want to download them all
98-
node_toolchain = select({
99-
"@bazel_tools//src/conditions:linux_x86_64": "@node20_linux_amd64//:node_toolchain",
100-
"@bazel_tools//src/conditions:darwin": "@node20_darwin_amd64//:node_toolchain",
101-
"@bazel_tools//src/conditions:windows": "@node20_windows_amd64//:node_toolchain",
102-
}),
10377
)
78+
79+
[
80+
js_test(
81+
name = "main_toolchain_%s" % version,
82+
args = [version],
83+
entry_point = "binary_version.js",
84+
# using the select statement will download toolchains for all three platforms
85+
# you can also just provide an individual toolchain if you don't want to download them all
86+
node_toolchain = select({
87+
"@bazel_tools//src/conditions:linux_x86_64": "@node%s_linux_amd64//:node_toolchain" % version,
88+
"@bazel_tools//src/conditions:darwin": "@node%s_darwin_amd64//:node_toolchain" % version,
89+
"@bazel_tools//src/conditions:windows": "@node%s_windows_amd64//:node_toolchain" % version,
90+
}),
91+
)
92+
for version in [
93+
"20",
94+
"22",
95+
"24",
96+
]
97+
]
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
91b7822d971ff2561696d8db681172e53b05160b597925f5a03d08f5f4ee8d6f js/private/test/image/cksum_node
1+
c01c8dc7e9a202ec0f0e1bd4e48afcdfc4c71c27ebe186275d525eeb199b29ac js/private/test/image/cksum_node
22
052600f3a82ab6a4cc12cab7384971c960f9c589fdbfcf21bca563c36ff7d16e js/private/test/image/cksum_package_store_3p
33
971f291232f3ab63aff37fb66c96fbf0eddc05ea9564b9673d0d2c9bfe958994 js/private/test/image/cksum_package_store_1p
44
febf95a6d554c9bda3f0515bfd5ef273ac67d31c231d8162beaef8c4b7bc72f3 js/private/test/image/cksum_node_modules

js/private/test/image/custom_layers_nomatch_test_node.listing

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.
1414
drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/
1515
drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/
1616
drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/bin/
17-
-r-xr-xr-x 0 0 0 91342624 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/bin/node
17+
-r-xr-xr-x 0 0 0 97607264 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/bin/node

js/private/test/image/custom_owner_test_node.listing

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ drwxr-xr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/bin.runf
1313
drwxr-xr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/
1414
drwxr-xr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/
1515
drwxr-xr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/bin/
16-
-r-xr-xr-x 0 100 0 91342624 Jan 1 1970 ./js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/bin/node
16+
-r-xr-xr-x 0 100 0 97607264 Jan 1 1970 ./js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/bin/node

js/private/test/image/default_test_node.listing

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/bin.runf
1313
drwxr-xr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/
1414
drwxr-xr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/
1515
drwxr-xr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/bin/
16-
-r-xr-xr-x 0 0 0 91342624 Jan 1 1970 ./js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/bin/node
16+
-r-xr-xr-x 0 0 0 97607264 Jan 1 1970 ./js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/bin/node

js/private/test/image/non_ascii/custom_layer_groups_test_node.listing

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/non_
1414
drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/non_ascii/bin2.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/
1515
drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/non_ascii/bin2.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/
1616
drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/non_ascii/bin2.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/bin/
17-
-r-xr-xr-x 0 0 0 91342624 Jan 1 1970 ./app/js/private/test/image/non_ascii/bin2.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/bin/node
17+
-r-xr-xr-x 0 0 0 97607264 Jan 1 1970 ./app/js/private/test/image/non_ascii/bin2.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/bin/node

js/private/test/image/regex_edge_cases_test_node.listing

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.
1414
drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/
1515
drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/
1616
drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/bin/
17-
-r-xr-xr-x 0 0 0 91342624 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/bin/node
17+
-r-xr-xr-x 0 0 0 97607264 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/bin/node

js/private/test/node-patches/BUILD.bazel

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@ CJS_TESTS = [
2121

2222
# Multiple node toolchains for testing across versions
2323
TOOLCHAINS_NAMES = [
24-
"node16",
25-
"node18",
24+
# default name+version
25+
"nodejs",
26+
27+
# custom versions for tests
2628
"node20",
2729
"node22",
2830
"node24",

0 commit comments

Comments
 (0)