Merge branch 'uuid'

aminya · Aug 19, 2024 · 67fdd88 · 67fdd88
2 parents 79d1bb9 + 9f5fd9a
commit 67fdd88
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 16 deletions.
diff --git a/packages/cache/package.json b/packages/cache/package.json
@@ -46,11 +46,11 @@
     "@azure/ms-rest-js": "^2.6.0",
     "@azure/storage-blob": "^12.13.0",
     "semver": "^7.5.8",
-    "uuid": "^3.3.3"
+    "uuid": "^10.0.0"
   },
   "devDependencies": {
     "@types/semver": "7.5.8",
-    "@types/uuid": "^3.4.5",
+    "@types/uuid": "^10.0.0",
     "typescript": "^5.2.2"
   }
 }
diff --git a/packages/core/package-lock.json b/packages/core/package-lock.json
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -38,10 +38,10 @@
   "dependencies": {
     "@actions/exec": "^1.1.1",
     "@actions/http-client": "^2.0.1",
-    "uuid": "^8.3.2"
+    "uuid": "^10.0.0"
   },
   "devDependencies": {
     "@types/node": "^12.0.2",
     "@types/uuid": "^8.3.4"
   }
-}
+}
diff --git a/packages/tool-cache/package.json b/packages/tool-cache/package.json
@@ -41,12 +41,12 @@
     "@actions/http-client": "^2.0.1",
     "@actions/io": "^1.1.1",
     "semver": "^7.5.8",
-    "uuid": "^3.3.2"
+    "uuid": "^10.0.0"
   },
   "devDependencies": {
     "@types/nock": "^11.1.0",
     "@types/semver": "^7.5.8",
-    "@types/uuid": "^3.4.4",
+    "@types/uuid": "10.0.0",
     "nock": "^13.2.9"
   }
 }
diff --git a/packages/tool-cache/src/tool-cache.ts b/packages/tool-cache/src/tool-cache.ts
@@ -10,7 +10,7 @@ import * as stream from 'stream'
 import * as util from 'util'
 import {ok} from 'assert'
 import {OutgoingHttpHeaders} from 'http'
-import uuidV4 from 'uuid/v4'
+import * as uuid from 'uuid'
 import {exec} from '@actions/exec/lib/exec'
 import {ExecOptions} from '@actions/exec/lib/interfaces'
 import {RetryHelper} from './retry-helper'
@@ -41,7 +41,7 @@ export async function downloadTool(
   auth?: string,
   headers?: OutgoingHttpHeaders
 ): Promise<string> {
-  dest = dest || path.join(_getTempDirectory(), uuidV4())
+  dest = dest || path.join(_getTempDirectory(), uuid.v4())
   await io.mkdirP(path.dirname(dest))
   core.debug(`Downloading ${url}`)
   core.debug(`Destination ${dest}`)
@@ -651,7 +651,7 @@ export async function findFromManifest(
 async function _createExtractFolder(dest?: string): Promise<string> {
   if (!dest) {
     // create a temp dir
-    dest = path.join(_getTempDirectory(), uuidV4())
+    dest = path.join(_getTempDirectory(), uuid.v4())
   }
   await io.mkdirP(dest)
   return dest