Save/restore exploded Gradle dist rather than zip

To save space, future versions of Gradle are likely to delete the downloaded distribution after extracting it. See gradle/gradle#3605 and gradle/gradle#19495. To cater for this we will now save/restore the extracted distribution rather than the downloaded zip file.
gradle · Apr 5, 2022 · 0e24fa1 · 0e24fa1
1 parent bd717ac
commit 0e24fa1
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/dist/main/index.js b/dist/main/index.js
diff --git a/dist/main/index.js.map b/dist/main/index.js.map
diff --git a/dist/post/index.js b/dist/post/index.js
diff --git a/dist/post/index.js.map b/dist/post/index.js.map
diff --git a/src/cache-extract-entries.ts b/src/cache-extract-entries.ts
@@ -304,13 +304,19 @@ export class GradleHomeEntryExtractor extends AbstractEntryExtractor {
             patterns: string[],
             bundle: boolean
         ): ExtractedCacheEntryDefinition => {
-            const resolvedPattern = patterns.map(x => path.resolve(this.gradleUserHome, x)).join('\n')
-            return new ExtractedCacheEntryDefinition(artifactType, resolvedPattern, bundle)
+            const resolvedPatterns = patterns
+                .map(x => {
+                    const isDir = x.endsWith('/')
+                    const resolved = path.resolve(this.gradleUserHome, x)
+                    return isDir ? `${resolved}/` : resolved // Restore trailing '/' removed by path.resolve()
+                })
+                .join('\n')
+            return new ExtractedCacheEntryDefinition(artifactType, resolvedPatterns, bundle)
         }
 
         return [
             entryDefinition('generated-gradle-jars', ['caches/*/generated-gradle-jars/*.jar'], false),
-            entryDefinition('wrapper-zips', ['wrapper/dists/*/*/*.zip'], false),
+            entryDefinition('wrapper-zips', ['wrapper/dists/*/*/*/'], false), // Directories only
             entryDefinition('java-toolchains', ['jdks/*.zip', 'jdks/*.tar.gz'], false),
             entryDefinition('dependencies', ['caches/modules-*/files-*/*/*/*/*'], true),
             entryDefinition('instrumented-jars', ['caches/jars-*/*'], true),