Merge pull request #237 from gradle-update/cristian/fix-234

Include all changed files after the re-run of `wrapper` task.
gradle-update · Jun 15, 2021 · 6d7cff0 · 6d7cff0
2 parents d1ef253 + 8a99a7e
commit 6d7cff0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -1035,13 +1035,16 @@ class MainAction {
                     yield updater.update();
                     core.endGroup();
                     core.startGroup('Checking whether any file has been updated');
-                    const modifiedFiles = yield git.gitDiffNameOnly();
+                    let modifiedFiles = yield git.gitDiffNameOnly();
                     core.debug(`Modified files count: ${modifiedFiles.length}`);
                     core.debug(`Modified files list: ${modifiedFiles}`);
                     core.endGroup();
                     if (modifiedFiles.length) {
                         core.startGroup('Updating Wrapper (2nd update)');
                         yield updater.update();
+                        modifiedFiles = yield git.gitDiffNameOnly();
+                        core.debug(`Modified files count: ${modifiedFiles.length}`);
+                        core.debug(`Modified files list: ${modifiedFiles}`);
                         core.endGroup();
                         core.startGroup('Verifying Wrapper');
                         yield updater.verify();

diff --git a/src/tasks/main.ts b/src/tasks/main.ts
@@ -134,7 +134,7 @@ export class MainAction {
         core.endGroup();
 
         core.startGroup('Checking whether any file has been updated');
-        const modifiedFiles = await git.gitDiffNameOnly();
+        let modifiedFiles = await git.gitDiffNameOnly();
         core.debug(`Modified files count: ${modifiedFiles.length}`);
         core.debug(`Modified files list: ${modifiedFiles}`);
         core.endGroup();
@@ -145,6 +145,9 @@ export class MainAction {
           // https://docs.gradle.org/current/userguide/gradle_wrapper.html#sec:upgrading_wrapper
           core.startGroup('Updating Wrapper (2nd update)');
           await updater.update();
+          modifiedFiles = await git.gitDiffNameOnly();
+          core.debug(`Modified files count: ${modifiedFiles.length}`);
+          core.debug(`Modified files list: ${modifiedFiles}`);
           core.endGroup();
 
           core.startGroup('Verifying Wrapper');