Improve caching logic of #1 (#3)

* Improve caching logic of #1

Uses a single step instead of two seperate steps, as it is less bugprone

* Update as requested and suggested by @mymindstorm

Author: Skycoder42

.github/workflows/run.yml

@@ -21,20 +21,13 @@ jobs:
         with:
           path: emsdk-cache
           key: ${{ runner.os }}-emsdk-1.38.48
-      - name: Setup emsdk (cache not found)  
+      - name: Setup emsdk (use cache if found, create otherwise)  
         uses: mymindstorm/setup-emsdk@master
-        if: steps.cache.outputs.cache-hit != 'true'
-        with:
-          version: 1.38.48
-          store-actions-cache: 'emsdk-cache'
-          no-cache: true
-      - name: Setup emsdk (cache found)        
-        uses: mymindstorm/setup-emsdk@master
-        if: steps.cache.outputs.cache-hit == 'true'
         with:
           version: 1.38.48
           actions-cache-folder: 'emsdk-cache'
           no-cache: true
+          
       - name: Verify
         run: emcc -v
   no-install:

README.md

@@ -25,35 +25,24 @@ jobs:
   uses: actions/cache@v1
   id: cache # This is important!
   with:
-    # Set to the same folder as store-actions-cache (more below)
+    # Set to the same folder as actions-cache-folder (more below)
     path: 'emsdk-cache'
     # Set the end bit to emsdk version
     key: ${{ runner.os }}-emsdk-1.38.40
 
-- name: Setup emsdk (cache not found)
+- name: Setup emsdk (use cache if found, create otherwise)
   uses: mymindstorm/setup-emsdk@v2
-  if: steps.cache.outputs.cache-hit != 'true'
   with:
     # Make sure to set a version number!
     version: 1.38.40
     # This is the name of the cache folder.
     # The cache folder will be placed in the build directory,
     #  so make sure it doesn't conflict with anything!
-    store-actions-cache: 'emsdk-cache'
+    actions-cache-folder: 'emsdk-cache'
     # This stops it from using tc.cacheDir since we are using
     #  actions/cache.
     no-cache: true
 
-- name: Setup emsdk (cache found)        
-  uses: mymindstorm/setup-emsdk@v2
-  if: steps.cache.outputs.cache-hit == 'true'
-  with:
-    # Make sure to set a version number!
-    version: 1.38.40
-    # Set to the same folder as store-actions-cache
-    actions-cache-folder: 'emsdk-cache'
-    no-cache: true
-
 - name: Verify
   run: emcc -v
 ```
@@ -70,11 +59,8 @@ no-install:
 no-cache:
   description: "If true will not cache any downloads with tc.cacheDir."
   default: false
-store-actions-cache:
-  description: "Name of the folder emsdk cache will be copied to on sucessful run. This folder will go under $GITHUB_HOME (I.e. build dir)"
-  default: ''
 actions-cache-folder:
-  description: "Set to the folder where your cached emsdk-master folder is."
+  description: "Set to the folder where your cached emsdk-master folder is or where emsdk cache will be copied to on sucessful run. This folder will go under $GITHUB_HOME (I.e. build dir)."
   default: ''
 ```
 

action.yml

@@ -11,11 +11,8 @@ inputs:
   no-cache:
     description: "If true will not cache any downloads with tc.cacheDir."
     default: false
-  store-actions-cache:
-    description: "Name of the folder emsdk cache will be copied to on sucessful run. This folder will go under $GITHUB_HOME (I.e. build dir)"
-    default: ''
   actions-cache-folder:
-    description: "Set to the folder where your cached emsdk-master folder is."
+    description: "Set to the folder where your cached emsdk-master folder is or where emsdk cache will be copied to on sucessful run. This folder will go under $GITHUB_HOME (I.e. build dir)."
     default: ''
 runs:
   using: 'node12'

lib/main.js

@@ -27,23 +27,23 @@ function run() {
                 version: yield core.getInput("version"),
                 noInstall: yield core.getInput("no-install"),
                 noCache: yield core.getInput("no-cache"),
-                storeActionsCache: yield core.getInput("store-actions-cache"),
-                useActionsCacheFolder: yield core.getInput("actions-cache-folder")
+                actionsCacheFolder: yield core.getInput("actions-cache-folder")
             };
             let emsdkFolder;
             let foundInCache = false;
             if (emArgs.version !== "latest" && emArgs.noCache === "false") {
                 emsdkFolder = yield tc.find('emsdk', emArgs.version, os.arch());
             }
-            if (emArgs.useActionsCacheFolder) {
-                const fullCachePath = `${process.env.GITHUB_WORKSPACE}/${emArgs.useActionsCacheFolder}`;
+            if (emArgs.actionsCacheFolder) {
+                const fullCachePath = `${process.env.GITHUB_WORKSPACE}/${emArgs.actionsCacheFolder}`;
                 try {
                     fs.accessSync(fullCachePath + '/emsdk-master/emsdk', fs.constants.X_OK);
                     emsdkFolder = fullCachePath;
                     foundInCache = true;
                 }
                 catch (e) {
-                    core.error(`Could not access cached files at path: ${fullCachePath}`);
+                    core.warning(`No cached files found at path "${fullCachePath}" - downloading and caching emsdk.`);
+                    yield exec.exec(`rm -rf ${fullCachePath}`);
                     // core.debug(fs.readdirSync(fullCachePath + '/emsdk-master').toString());
                 }
             }
@@ -92,9 +92,9 @@ function run() {
                         }
                     }
                 } });
-            if (emArgs.storeActionsCache) {
-                fs.mkdirSync(`${process.env.GITHUB_WORKSPACE}/${emArgs.storeActionsCache}`, { recursive: true });
-                yield exec.exec(`cp -r ${emsdkFolder}/emsdk-master ${process.env.GITHUB_WORKSPACE}/${emArgs.storeActionsCache}`);
+            if (emArgs.actionsCacheFolder && !foundInCache) {
+                fs.mkdirSync(`${process.env.GITHUB_WORKSPACE}/${emArgs.actionsCacheFolder}`, { recursive: true });
+                yield exec.exec(`cp -r ${emsdkFolder}/emsdk-master ${process.env.GITHUB_WORKSPACE}/${emArgs.actionsCacheFolder}`);
             }
         }
         catch (error) {

src/main.ts

@@ -10,8 +10,7 @@ async function run() {
       version: await core.getInput("version"),
       noInstall: await core.getInput("no-install"),
       noCache: await core.getInput("no-cache"),
-      storeActionsCache: await core.getInput("store-actions-cache"),
-      useActionsCacheFolder: await core.getInput("actions-cache-folder")
+      actionsCacheFolder: await core.getInput("actions-cache-folder")
     };
 
     let emsdkFolder;
@@ -21,14 +20,15 @@ async function run() {
       emsdkFolder = await tc.find('emsdk', emArgs.version, os.arch());
     } 
 
-    if (emArgs.useActionsCacheFolder) {
-      const fullCachePath = `${process.env.GITHUB_WORKSPACE}/${emArgs.useActionsCacheFolder}`
+    if (emArgs.actionsCacheFolder) {
+      const fullCachePath = `${process.env.GITHUB_WORKSPACE}/${emArgs.actionsCacheFolder}`
       try {
         fs.accessSync(fullCachePath + '/emsdk-master/emsdk', fs.constants.X_OK)
         emsdkFolder = fullCachePath;
         foundInCache = true;
       } catch (e) {
-        core.error(`Could not access cached files at path: ${fullCachePath}`);
+        core.warning(`No cached files found at path "${fullCachePath}" - downloading and caching emsdk.`);
+        await exec.exec(`rm -rf ${fullCachePath}`);
         // core.debug(fs.readdirSync(fullCachePath + '/emsdk-master').toString());
       }
     }
@@ -86,9 +86,9 @@ async function run() {
       }
     }})
 
-    if (emArgs.storeActionsCache) {
-      fs.mkdirSync(`${process.env.GITHUB_WORKSPACE}/${emArgs.storeActionsCache}`, { recursive: true });
-      await exec.exec(`cp -r ${emsdkFolder}/emsdk-master ${process.env.GITHUB_WORKSPACE}/${emArgs.storeActionsCache}`);
+    if (emArgs.actionsCacheFolder && !foundInCache) {
+      fs.mkdirSync(`${process.env.GITHUB_WORKSPACE}/${emArgs.actionsCacheFolder}`, { recursive: true });
+      await exec.exec(`cp -r ${emsdkFolder}/emsdk-master ${process.env.GITHUB_WORKSPACE}/${emArgs.actionsCacheFolder}`);
     }
   } catch (error) {
     core.setFailed(error.message);