Skip to content

Fix NPM tests on ARM based runners #3085

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Goooler merged 1 commit into from
Sep 16, 2026
Merged

Fix NPM tests on ARM based runners #3085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions ...gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016-2025 DiffPlug
* Copyright 2016-2026 DiffPlug
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -29,13 +29,13 @@ void useNodeAndNpmFromNodeGradlePlugin() throws Exception {
setFile("build.gradle").toLines(
"plugins {",
" id 'com.diffplug.spotless'",
" id 'com.github.node-gradle.node' version '3.5.1'",
" id 'com.github.node-gradle.node' version '7.1.0'",
"}",
"repositories { mavenCentral() }",
"node {",
" download = true",
" version = '18.16.1'",
" npmVersion = '9.5.1'",
" version = '22.14.0'",
" npmVersion = '10.9.2'",
" workDir = file(\"${buildDir}/nodejs\")",
" npmWorkDir = file(\"${buildDir}/npm\")",
"}",
Expand Down Expand Up @@ -106,12 +106,12 @@ void useNpmFromNodeGradlePlugin() throws Exception {
setFile("build.gradle").toLines(
"plugins {",
" id 'com.diffplug.spotless'",
" id 'com.github.node-gradle.node' version '3.5.1'",
" id 'com.github.node-gradle.node' version '7.1.0'",
"}",
"repositories { mavenCentral() }",
"node {",
" download = true",
" version = '18.16.1'",
" version = '22.14.0'",
" workDir = file(\"${buildDir}/nodejs\")",
"}",
"def prettierConfig = [:]",
Expand Down Expand Up @@ -145,12 +145,12 @@ void useNpmNextToConfiguredNodePluginFromNodeGradlePlugin() throws Exception {
setFile("build.gradle").toLines(
"plugins {",
" id 'com.diffplug.spotless'",
" id 'com.github.node-gradle.node' version '3.5.1'",
" id 'com.github.node-gradle.node' version '7.1.0'",
"}",
"repositories { mavenCentral() }",
"node {",
" download = true",
" version = '18.13.0'",
" version = '22.14.0'",
" workDir = file(\"${buildDir}/nodejs\")",
"}",
"def prettierConfig = [:]",
Expand Down
6 changes: 3 additions & 3 deletions ...ug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_1.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
*/
plugins {
id 'com.diffplug.spotless'
id 'com.github.node-gradle.node' version '3.5.1'
id 'com.github.node-gradle.node' version '7.1.0'
}
repositories { mavenCentral() }
node {
download = true
version = '18.16.1'
npmVersion = '9.5.1'
version = '22.14.0'
npmVersion = '10.9.2'
// when setting both these directories, npm and node will be in separate directories
workDir = file("${buildDir}/nodejs")
npmWorkDir = file("${buildDir}/npm")
Expand Down
4 changes: 2 additions & 2 deletions ...ug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_2.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
*/
plugins {
id 'com.diffplug.spotless'
id 'com.github.node-gradle.node' version '3.5.1'
id 'com.github.node-gradle.node' version '7.1.0'
}
repositories { mavenCentral() }
node {
download = true
version = '18.16.1'
version = '22.14.0'
// when not setting an explicit `npmWorkDir`, the npm binary will be installed next to the node binary
workDir = file("${buildDir}/nodejs")
}
Expand Down
4 changes: 2 additions & 2 deletions .../com/diffplug/spotless/maven/npm/NpmTestsWithDynamicallyInstalledNpmInstallationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 DiffPlug
* Copyright 2023-2026 DiffPlug
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -28,7 +28,7 @@ public class NpmTestsWithDynamicallyInstalledNpmInstallationTest extends MavenIn
@Test
void useDownloadedNpmInstallation() throws Exception {
writePomWithPrettierSteps(
pomPluginLines("v18.13.0", null),
pomPluginLines("v22.14.0", null),
"src/main/typescript/test.ts",
"<prettier>",
" <npmExecutable>" + installedNpmPath() + "</npmExecutable>",
Expand Down
Loading