Skip to content

Commit 5fe0031

Browse files
authored
Fix Vaadin tests on newer versions of node (#16637)
1 parent 9ecf193 commit 5fe0031

3 files changed

Lines changed: 5 additions & 17 deletions

File tree

.github/renovate.json5

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -255,16 +255,6 @@
255255
'org.apache.groovy:**'
256256
],
257257
},
258-
{
259-
// vaadin 14 tests require node 16
260-
matchPackageNames: [
261-
'actions/node-versions',
262-
],
263-
matchUpdateTypes: [
264-
'major',
265-
],
266-
enabled: false,
267-
},
268258
{
269259
// intentionally using Spring Boot 2 to make sure the earliest version is supported
270260
matchFileNames: [

.github/workflows/build-common.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -287,11 +287,8 @@ jobs:
287287
distribution: temurin
288288
java-version-file: .java-version
289289

290-
# vaadin 14 tests fail with node 18
291290
- name: Set up Node
292291
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
293-
with:
294-
node-version: 16
295292

296293
# vaadin tests use pnpm
297294
- name: Cache pnpm modules

instrumentation/vaadin-14.2/javaagent/build.gradle.kts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,11 @@ testing {
8282
tasks {
8383
withType<Test>().configureEach {
8484
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
85+
86+
jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
87+
systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
88+
// Enable legacy OpenSSL provider for Node.js 17+ compatibility with webpack 4
89+
environment("NODE_OPTIONS", "--openssl-legacy-provider")
8590
}
8691

8792
check {
@@ -102,7 +107,3 @@ configurations.configureEach {
102107
}
103108
}
104109
}
105-
tasks.withType<Test>().configureEach {
106-
jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
107-
systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
108-
}

0 commit comments

Comments
 (0)