refactoring

amyu · Sep 17, 2023 · 35225ae · 35225ae
1 parent 5523279
commit 35225ae
Show file tree

Hide file tree

Showing 9 changed files with 14,563 additions and 13,764 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -85,8 +85,8 @@ jobs:
       - run: |
           ./sample-android-project/gradlew -p sample-android-project assembleDebug --stacktrace
 
-  test_167:
-    name: run test_167
+  test_check_cmdline_tools_path:
+    name: run check cmdline-tools path
     runs-on: ${{ matrix.os }}
     timeout-minutes: 20
     strategy:

diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js
diff --git a/dist/setup/index.js b/dist/setup/index.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -27,10 +27,9 @@
   "author": "amyu",
   "license": "MIT",
   "dependencies": {
-    "@actions/cache": "^3.0.5",
+    "@actions/cache": "^3.2.2",
     "@actions/core": "^1.10.1",
-    "@actions/tool-cache": "^2.0.1",
-    "fs-extra": "^11.1.1"
+    "@actions/tool-cache": "^2.0.1"
   },
   "devDependencies": {
     "@types/node": "^20.5.6",

diff --git a/patches/@actions+cache+3.0.5.patch → patches/@actions+cache+3.2.2.patch b/patches/@actions+cache+3.0.5.patch → patches/@actions+cache+3.2.2.patch
@@ -1,22 +1,22 @@
 diff --git a/node_modules/@actions/cache/lib/cache.d.ts b/node_modules/@actions/cache/lib/cache.d.ts
-index 16b20f7..aea77ba 100644
+index 4658366..b796e58 100644
 --- a/node_modules/@actions/cache/lib/cache.d.ts
 +++ b/node_modules/@actions/cache/lib/cache.d.ts
-@@ -20,7 +20,7 @@ export declare function isFeatureAvailable(): boolean;
-  * @param downloadOptions cache download options
+@@ -21,7 +21,7 @@ export declare function isFeatureAvailable(): boolean;
+  * @param enableCrossOsArchive an optional boolean enabled to restore on windows any cache created on any platform
   * @returns string returns the key for the cache hit, otherwise returns undefined
   */
--export declare function restoreCache(paths: string[], primaryKey: string, restoreKeys?: string[], options?: DownloadOptions): Promise<string | undefined>;
-+export declare function restoreCache(paths: string[], primaryKey: string, restoreKeys?: string[], options?: DownloadOptions): Promise<CacheEntry | undefined>;
+-export declare function restoreCache(paths: string[], primaryKey: string, restoreKeys?: string[], options?: DownloadOptions, enableCrossOsArchive?: boolean): Promise<string | undefined>;
++export declare function restoreCache(paths: string[], primaryKey: string, restoreKeys?: string[], options?: DownloadOptions, enableCrossOsArchive?: boolean): Promise<CacheEntry | undefined>;
  /**
   * Saves a list of files with the specified key
   *
-@@ -29,4 +29,12 @@ export declare function restoreCache(paths: string[], primaryKey: string, restor
+@@ -31,4 +31,12 @@ export declare function restoreCache(paths: string[], primaryKey: string, restor
   * @param options cache upload options
   * @returns number returns cacheId if the cache was saved successfully and throws an error if save fails
   */
--export declare function saveCache(paths: string[], key: string, options?: UploadOptions): Promise<number>;
-+export declare function saveCache(paths: string[], key: string, options?: UploadOptions): Promise<CacheEntry>;
+-export declare function saveCache(paths: string[], key: string, options?: UploadOptions, enableCrossOsArchive?: boolean): Promise<number>;
++export declare function saveCache(paths: string[], key: string, options?: UploadOptions, enableCrossOsArchive?: boolean): Promise<CacheEntry>;
 +
 +// PATCHED: Add `CacheEntry` as return type for save/restore functions
 +// This allows us to track and report on cache entry sizes.
@@ -26,23 +26,12 @@ index 16b20f7..aea77ba 100644
 +    constructor(key: string, size?: number);
 +}
 diff --git a/node_modules/@actions/cache/lib/cache.js b/node_modules/@actions/cache/lib/cache.js
-index 4dc5e88..92d99d5 100644
+index 9d636aa..a176bd7 100644
 --- a/node_modules/@actions/cache/lib/cache.js
 +++ b/node_modules/@actions/cache/lib/cache.js
-@@ -95,26 +95,18 @@ function restoreCache(paths, primaryKey, restoreKeys, options) {
-             }
-             archivePath = path.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod));
-             core.debug(`Archive Path: ${archivePath}`);
-+            const restoredEntry = new CacheEntry(cacheEntry.cacheKey);
-             // Download the cache from the cache entry
-             yield cacheHttpClient.downloadCache(cacheEntry.archiveLocation, archivePath, options);
-             if (core.isDebug()) {
-                 yield tar_1.listTar(archivePath, compressionMethod);
-             }
-             const archiveFileSize = utils.getArchiveFileSizeInBytes(archivePath);
-+            restoredEntry.size = archiveFileSize;
+@@ -127,18 +127,21 @@ function restoreCache(paths, primaryKey, restoreKeys, options, enableCrossOsArch
              core.info(`Cache Size: ~${Math.round(archiveFileSize / (1024 * 1024))} MB (${archiveFileSize} B)`);
-             yield tar_1.extractTar(archivePath, compressionMethod);
+             yield (0, tar_1.extractTar)(archivePath, compressionMethod);
              core.info('Cache restored successfully');
 -            return cacheEntry.cacheKey;
 -        }
@@ -55,29 +44,31 @@ index 4dc5e88..92d99d5 100644
 -                // Supress all non-validation cache related errors because caching should be optional
 -                core.warning(`Failed to restore: ${error.message}`);
 -            }
-+            return restoredEntry;
++
++            // PATCHED - Return more inforamtion about restored entry
++            return new CacheEntry(cacheEntry.cacheKey, archiveFileSize);;
          }
++        // PATCHED - propagate errors
++        // catch (error) {
++        //     const typedError = error;
++        //     if (typedError.name === ValidationError.name) {
++        //         throw error;
++        //     }
++        //     else {
++        //         // Supress all non-validation cache related errors because caching should be optional
++        //         core.warning(`Failed to restore: ${error.message}`);
++        //     }
++        // }
          finally {
              // Try to delete the archive to save space
-@@ -153,6 +145,7 @@ function saveCache(paths, key, options) {
-         const archiveFolder = yield utils.createTempDirectory();
-         const archivePath = path.join(archiveFolder, utils.getCacheFileName(compressionMethod));
-         core.debug(`Archive Path: ${archivePath}`);
-+        const savedEntry = new CacheEntry(key);
-         try {
-             yield tar_1.createTar(archiveFolder, cachePaths, compressionMethod);
-             if (core.isDebug()) {
-@@ -160,6 +153,7 @@ function saveCache(paths, key, options) {
+             try {
+@@ -206,19 +209,23 @@ function saveCache(paths, key, options, enableCrossOsArchive = false) {
              }
-             const fileSizeLimit = 10 * 1024 * 1024 * 1024; // 10GB per repo limit
-             const archiveFileSize = utils.getArchiveFileSizeInBytes(archivePath);
-+            savedEntry.size = archiveFileSize;
-             core.debug(`File Size: ${archiveFileSize}`);
-             // For GHES, this check will take place in ReserveCache API with enterprise file size limit
-             if (archiveFileSize > fileSizeLimit && !utils.isGhes()) {
-@@ -182,18 +176,6 @@ function saveCache(paths, key, options) {
              core.debug(`Saving Cache (ID: ${cacheId})`);
              yield cacheHttpClient.saveCache(cacheId, archivePath, options);
++
++            // PATCHED - Return more inforamtion about saved entry
++            return new CacheEntry(key, archiveFileSize);
          }
 -        catch (error) {
 -            const typedError = error;
@@ -91,15 +82,23 @@ index 4dc5e88..92d99d5 100644
 -                core.warning(`Failed to save: ${typedError.message}`);
 -            }
 -        }
++        // PATCHED - propagate errors
++        // catch (error) {
++        //     const typedError = error;
++        //     if (typedError.name === ValidationError.name) {
++        //         throw error;
++        //     }
++        //     else if (typedError.name === ReserveCacheError.name) {
++        //         core.info(`Failed to save: ${typedError.message}`);
++        //     }
++        //     else {
++        //         core.warning(`Failed to save: ${typedError.message}`);
++        //     }
++        // }
          finally {
              // Try to delete the archive to save space
              try {
-@@ -203,8 +185,15 @@ function saveCache(paths, key, options) {
-                 core.debug(`Failed to delete archive: ${error}`);
-             }
-         }
--        return cacheId;
-+        return savedEntry;
+@@ -232,4 +239,11 @@ function saveCache(paths, key, options, enableCrossOsArchive = false) {
      });
  }
  exports.saveCache = saveCache;

diff --git a/patches/README.md b/patches/README.md
@@ -1,2 +1,2 @@
-@actions+cache+3.0.5.patch was Clone from
-https://github.com/gradle/gradle-build-action/blob/main/patches/%40actions%2Bcache%2B3.0.4.patch
+@actions+cache+3.2.2.patch was Clone from
+https://github.com/gradle/gradle-build-action/blob/main/patches/%40actions%2Bcache%2B3.2.2.patch
diff --git a/src/cache.ts b/src/cache.ts
@@ -11,7 +11,7 @@ function generateRestoreKey(
   ndkVersion: string,
   cmakeVersion: string
 ): string {
-  return `${sdkVersion}-${buildToolsVersion}-${ndkVersion}-${cmakeVersion}-v2`
+  return `${sdkVersion}-${buildToolsVersion}-${ndkVersion}-${cmakeVersion}-v3.1`
 }
 
 export async function restoreCache(

diff --git a/src/installer.ts b/src/installer.ts
@@ -69,7 +69,7 @@ export async function getAndroidSdk(
       `cmd /c "rename ${path.join(
         extractedCmdlineToolPath,
         'cmdline-tools'
-      )} latest`
+      )} latest"`
     )
   } else {
     await fs.mkdir(path.join(ANDROID_SDK_ROOT, 'cmdline-tools', 'latest'), {