From 2e18987d29dff3457f24b34e49b4c79af54136b1 Mon Sep 17 00:00:00 2001 From: Rhys Arkins <rhys@arkins.net> Date: Fri, 12 Jun 2020 11:46:15 +0200 Subject: [PATCH] fix(gradle-wrapper): correct artifact filenames for subdirs (#6491) --- lib/manager/gradle-wrapper/artifacts.spec.ts | 2 +- lib/manager/gradle-wrapper/artifacts.ts | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/lib/manager/gradle-wrapper/artifacts.spec.ts b/lib/manager/gradle-wrapper/artifacts.spec.ts index 6a62ca9201..d343734a36 100644 --- a/lib/manager/gradle-wrapper/artifacts.spec.ts +++ b/lib/manager/gradle-wrapper/artifacts.spec.ts @@ -70,7 +70,7 @@ describe(getName(__filename), () => { const execSnapshots = mockExecAll(exec); const res = await dcUpdate.updateArtifacts({ - packageFileName: 'gradle-wrapper.properties', + packageFileName: 'gradle/wrapper/gradle-wrapper.properties', updatedDeps: [], newPackageFileContent: await readString( `./expectedFiles/gradle/wrapper/gradle-wrapper.properties` diff --git a/lib/manager/gradle-wrapper/artifacts.ts b/lib/manager/gradle-wrapper/artifacts.ts index e396226e5c..dc020ce7e4 100644 --- a/lib/manager/gradle-wrapper/artifacts.ts +++ b/lib/manager/gradle-wrapper/artifacts.ts @@ -95,14 +95,22 @@ export async function updateArtifacts({ ); } const status = await platform.getRepoStatus(); + const artifactFileNames = [ + 'gradle/wrapper/gradle-wrapper.properties', + 'gradle/wrapper/gradle-wrapper.jar', + 'gradlew', + 'gradlew.bat', + ].map( + (filename) => + packageFileName + .replace('gradle/wrapper/', '') + .replace('gradle-wrapper.properties', '') + filename + ); const updateArtifactsResult = ( await Promise.all( - [ - 'gradle/wrapper/gradle-wrapper.properties', - 'gradle/wrapper/gradle-wrapper.jar', - 'gradlew', - 'gradlew.bat', - ].map(async (fileProjectPath) => addIfUpdated(status, fileProjectPath)) + artifactFileNames.map(async (fileProjectPath) => + addIfUpdated(status, fileProjectPath) + ) ) ).filter((e) => e != null); logger.debug( -- GitLab