Merge branch 'gmitch215/main'

fwilhe2 · Feb 4, 2025 · ad72826 · ad72826
2 parents fdf030f + 24b4adc
commit ad72826
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/main.ts b/src/main.ts
@@ -33,29 +33,30 @@ async function run(): Promise<void> {
         if (installNative) {
           const ktNativePath = await tc.downloadTool(nativeDownloadUrl(version))
           core.debug(`Downloaded Kotlin Native ${version} to ${ktNativePath}`)
-          core.exportVariable('KOTLIN_NATIVE_HOME', ktNativePath)
 
           const ktNativePathExtractedFolder = await extractNativeArchive(ktNativePath)
           nativeCachedPath = await tc.cacheDir(ktNativePathExtractedFolder, 'kotlin-native', version)
         }
       }
     }
 
+    const s = IS_WINDOWS ? '\\' : '/'
+
     /*
     The order of addPath call here matter because both archives have a "kotlinc" binary.
     */
     if (installNative) {
-      const nativePath = `${nativeCachedPath}/kotlin-native-prebuilt-${osName()}-${osArch()}-${version}`
-      core.addPath(`${nativePath}/bin`)
+      const nativePath = `${nativeCachedPath}${s}kotlin-native-prebuilt-${osName()}-${osArch()}-${version}`
+      core.addPath(`${nativePath}${s}bin`)
       core.exportVariable('KOTLIN_NATIVE_HOME', nativePath)
-      core.debug(`Added ${nativePath}/bin to PATH`)
+      core.debug(`Added ${nativePath}${s}bin to PATH`)
       await exec.exec('kotlinc-native', ['-version'])
     }
 
-    const kotlinPath = `${cachedPath}/kotlinc`
-    core.addPath(`${kotlinPath}/bin`)
+    const kotlinPath = `${cachedPath}${s}kotlinc`
+    core.addPath(`${kotlinPath}${s}bin`)
     core.exportVariable('KOTLIN_HOME', kotlinPath)
-    core.debug(`Added ${kotlinPath}/bin to PATH`)
+    core.debug(`Added ${kotlinPath}${s}bin to PATH`)
     await exec.exec('kotlinc', ['-version'])
 
     const script = core.getInput('script')