refactor conditions

dist/setup/index.js

@@ -61466,14 +61466,17 @@ function installGoVersion(info, auth, arch) {
         }
         // for github hosted windows runner handle latency of OS drive
         // by avoiding write operations to C:
+        if (!isWindows)
+            return addExecutablesToCache(extPath, info, arch);
         const isHosted = process.env['RUNNER_ENVIRONMENT'] === 'github-hosted' ||
             process.env['AGENT_ISSELFHOSTED'] === '0';
+        if (!isHosted)
+            return addExecutablesToCache(extPath, info, arch);
         const defaultToolCacheRoot = process.env['RUNNER_TOOL_CACHE'];
-        if (isWindows &&
-            defaultToolCacheRoot &&
-            isHosted &&
-            fs_1.default.existsSync('d:\\') &&
-            fs_1.default.existsSync('c:\\')) {
+        if (!defaultToolCacheRoot)
+            return addExecutablesToCache(extPath, info, arch);
+        if (!fs_1.default.existsSync('d:\\') || !fs_1.default.existsSync('c:\\'))
+            return addExecutablesToCache(extPath, info, arch);
         const substitutedToolCacheRoot = defaultToolCacheRoot
             .replace('C:', 'D:')
             .replace('c:', 'd:');
@@ -61489,8 +61492,6 @@ function installGoVersion(info, auth, arch) {
         process.env['RUNNER_TOOL_CACHE'] = defaultToolCacheRoot;
         // make outer code to continue using toolcache as if it were installed on c:
         return defaultToolCacheDir;
-        }
-        return yield addExecutablesToCache(extPath, info, arch);
     });
 }
 function extractGoArchive(archivePath) {

src/installer.ts

@@ -203,17 +203,20 @@ async function installGoVersion(
 
   // for github hosted windows runner handle latency of OS drive
   // by avoiding write operations to C:
+
+  if (!isWindows) return addExecutablesToCache(extPath, info, arch);
+
   const isHosted =
     process.env['RUNNER_ENVIRONMENT'] === 'github-hosted' ||
     process.env['AGENT_ISSELFHOSTED'] === '0';
+  if (!isHosted) return addExecutablesToCache(extPath, info, arch);
+
   const defaultToolCacheRoot = process.env['RUNNER_TOOL_CACHE'];
-  if (
-    isWindows &&
-    defaultToolCacheRoot &&
-    isHosted &&
-    fs.existsSync('d:\\') &&
-    fs.existsSync('c:\\')
-  ) {
+  if (!defaultToolCacheRoot) return addExecutablesToCache(extPath, info, arch);
+
+  if (!fs.existsSync('d:\\') || !fs.existsSync('c:\\'))
+    return addExecutablesToCache(extPath, info, arch);
+
   const substitutedToolCacheRoot = defaultToolCacheRoot
     .replace('C:', 'D:')
     .replace('c:', 'd:');
@@ -238,9 +241,6 @@ async function installGoVersion(
   return defaultToolCacheDir;
 }
 
-  return await addExecutablesToCache(extPath, info, arch);
-}
-
 export async function extractGoArchive(archivePath: string): Promise<string> {
   const platform = os.platform();
   let extPath: string;