Preserve file extension when downloading

Fixes #195

Author: fniephaus

dist/main.js

@@ -2,6 +2,7 @@ import * as c from '../constants.js'
 import * as core from '@actions/core'
 import * as tc from '@actions/tool-cache'
 import { join } from 'path'
+import { downloadFile } from '../utils.js'
 
 const MUSL_NAME = 'musl-toolchain'
 const MUSL_VERSION = '1.2.5-oracle-00001'
@@ -16,7 +17,7 @@ export async function setUpNativeImageMusl(): Promise<void> {
     core.info(`Found ${MUSL_NAME} ${MUSL_VERSION} in tool-cache @ ${toolPath}`)
   } else {
     core.startGroup(`Setting up musl for GraalVM Native Image...`)
-    const muslDownloadPath = await tc.downloadTool(
+    const muslDownloadPath = await downloadFile(
       `https://gds.oracle.com/download/bfs/archive/musl-toolchain-${MUSL_VERSION}-linux-amd64.tar.gz`
     )
     const muslExtractPath = await tc.extractTar(muslDownloadPath)

src/features/musl.ts

@@ -2,6 +2,7 @@ import * as c from './constants.js'
 import * as core from '@actions/core'
 import * as semver from 'semver'
 import {
+  downloadFile,
   downloadAndExtractJDK,
   downloadExtractAndCacheJDK,
   getContents,
@@ -10,7 +11,6 @@ import {
   getTaggedRelease
 } from './utils.js'
 import { downloadGraalVM, downloadGraalVMEELegacy } from './gds.js'
-import { downloadTool } from '@actions/tool-cache'
 import { basename } from 'path'
 
 const GRAALVM_DL_BASE = 'https://download.oracle.com/graalvm'
@@ -153,7 +153,7 @@ function determineToolName(javaVersion: string, isCommunity: boolean) {
 
 async function downloadGraalVMJDK(downloadUrl: string, javaVersion: string): Promise<string> {
   try {
-    return await downloadTool(downloadUrl)
+    return await downloadFile(downloadUrl)
   } catch (error) {
     if (error instanceof Error && error.message.includes('404')) {
       // Not Found
@@ -265,7 +265,7 @@ async function downloadGraalVMCELegacy(version: string, javaVersion: string): Pr
   const graalVMIdentifier = determineGraalVMLegacyIdentifier(false, version, javaVersion)
   const downloadUrl = `${GRAALVM_CE_DL_BASE}/${GRAALVM_TAG_PREFIX}${version}/${graalVMIdentifier}${c.GRAALVM_FILE_EXTENSION}`
   try {
-    return await downloadTool(downloadUrl)
+    return await downloadFile(downloadUrl)
   } catch (error) {
     if (error instanceof Error && error.message.includes('404')) {
       // Not Found

src/graalvm.ts

@@ -1,7 +1,6 @@
 import * as c from './constants.js'
 import * as semver from 'semver'
-import { downloadExtractAndCacheJDK, getTaggedRelease, getMatchingTags } from './utils.js'
-import { downloadTool } from '@actions/tool-cache'
+import { downloadFile, downloadExtractAndCacheJDK, getTaggedRelease, getMatchingTags } from './utils.js'
 import { spawnSync } from 'child_process'
 
 const LIBERICA_GH_USER = 'bell-sw'
@@ -13,7 +12,7 @@ export async function setUpLiberica(javaVersion: string, javaPackage: string): P
   const resolvedJavaVersion = await findLatestLibericaJavaVersion(javaVersion)
   const downloadUrl = await findLibericaURL(resolvedJavaVersion, javaPackage)
   const toolName = determineToolName(javaVersion, javaPackage)
-  return downloadExtractAndCacheJDK(async () => downloadTool(downloadUrl), toolName, javaVersion)
+  return downloadExtractAndCacheJDK(async () => downloadFile(downloadUrl), toolName, javaVersion)
 }
 
 export async function findLatestLibericaJavaVersion(javaVersion: string): Promise<string> {

src/liberica.ts

@@ -5,9 +5,10 @@ import * as semver from 'semver'
 import * as tc from '@actions/tool-cache'
 import * as fs from 'fs'
 import { ExecOptions, exec as e } from '@actions/exec'
+import { ok } from 'assert'
 import { readFileSync, readdirSync } from 'fs'
 import { createHash } from 'crypto'
-import { join } from 'path'
+import { extname, join } from 'path'
 import { tmpdir } from 'os'
 import { GitHub } from '@actions/github/lib/utils.js'
 
@@ -86,6 +87,22 @@ export async function downloadExtractAndCacheJDK(
   return findJavaHomeInSubfolder(toolPath)
 }
 
+/**
+ * This copy of tc.downloadTool() preserves the file extension in the dest.
+ * The file extension is required on Windows runners without .NET to extract zip files correctly.
+ * See #195 and https://github.com/actions/toolkit/blob/6b63a2bfc339a753a113d2266323a4d52d84dee0/packages/tool-cache/src/tool-cache.ts#L44
+ */
+export async function downloadFile(downloadUrl: string): Promise<string> {
+  const dest = join(_getTempDirectory(), crypto.randomUUID(), extname(downloadUrl))
+  return tc.downloadTool(downloadUrl, dest)
+}
+
+function _getTempDirectory(): string {
+  const tempDirectory = process.env['RUNNER_TEMP'] || ''
+  ok(tempDirectory, 'Expected RUNNER_TEMP to be defined')
+  return tempDirectory
+}
+
 export function calculateSHA256(filePath: string): string {
   const hashSum = createHash('sha256')
   hashSum.update(readFileSync(filePath))