Merge pull request #12 from dscho/fix-the-path

Fix the PATH

.github/workflows/test.yml

@@ -37,6 +37,7 @@ jobs:
         run: |
           set -x
           echo "This is the MSYS2 pseudo root: $(cygpath -aw /)"
+          test "gcc is /mingw64/bin/gcc" = "$(type gcc)"
           printf '%s\n' \
             "#include <stdio.h>" \
             '' \

main.ts

@@ -29,32 +29,34 @@ async function run(): Promise<void> {
         useCache = false
     }
 
+    let needToDownload = true
     try {
       if (useCache && (await restoreCache([outputDirectory], id))) {
         core.info(`Cached ${id} was successfully restored`)
-        return
+        needToDownload = false
       }
     } catch (e) {
       core.warning(`Cannot use @actions/cache (${e})`)
       useCache = false
     }
 
-    core.info(`Downloading ${artifactName}`)
-    await download(
-      outputDirectory,
-      verbose.match(/^\d+$/) ? parseInt(verbose) : verbose === 'true'
-    )
+    if (needToDownload) {
+      core.info(`Downloading ${artifactName}`)
+      await download(
+        outputDirectory,
+        verbose.match(/^\d+$/) ? parseInt(verbose) : verbose === 'true'
+      )
 
-    if (useCache && !(await saveCache([outputDirectory], id))) {
-      core.warning(`Failed to cache ${id}`)
+      if (useCache && !(await saveCache([outputDirectory], id))) {
+        core.warning(`Failed to cache ${id}`)
+      }
     }
 
     // Set up PATH so that Git for Windows' SDK's `bash.exe` is found
     core.addPath(`${outputDirectory}/usr/bin`)
-    core.exportVariable(
-      'MSYSTEM',
-      architecture === 'i686' ? 'MING32' : 'MINGW64'
-    )
+    const msystem = architecture === 'i686' ? 'MING32' : 'MINGW64'
+    core.addPath(`${outputDirectory}/${msystem.toLocaleLowerCase()}/bin`)
+    core.exportVariable('MSYSTEM', msystem)
   } catch (error) {
     core.setFailed(error.message)
   }