From 65598905c01231c68b9bbadbeaf250ddf9b10834 Mon Sep 17 00:00:00 2001 From: eric sciple Date: Sat, 18 Jan 2020 14:28:37 -0500 Subject: [PATCH] octokit client should follow proxy settings (#314) --- __tests__/tool-cache.test.ts | 2 +- package-lock.json | 32 +++++++++++--------------------- package.json | 4 ++-- src/tool-cache.ts | 2 +- 4 files changed, 15 insertions(+), 25 deletions(-) diff --git a/__tests__/tool-cache.test.ts b/__tests__/tool-cache.test.ts index 543280a..a289008 100644 --- a/__tests__/tool-cache.test.ts +++ b/__tests__/tool-cache.test.ts @@ -1,8 +1,8 @@ import * as fs from 'fs' -import * as nock from 'nock' import * as path from 'path' import * as io from '@actions/io' import * as exec from '@actions/exec' +import nock from 'nock' const cachePath = path.join(__dirname, 'CACHE') const tempPath = path.join(__dirname, 'TEMP') diff --git a/package-lock.json b/package-lock.json index 2ec8bf9..129e3df 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,31 +1,16 @@ { "name": "@actions/tool-cache", - "version": "1.3.0", + "version": "1.3.1", "lockfileVersion": 1, "requires": true, "dependencies": { - "@actions/core": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.2.1.tgz", - "integrity": "sha512-xD+CQd9p4lU7ZfRqmUcbJpqR+Ss51rJRVeXMyOLrZQImN9/8Sy/BEUBnHO/UKD3z03R686PVTLfEPmkropGuLw==" - }, - "@actions/exec": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.0.3.tgz", - "integrity": "sha512-TogJGnueOmM7ntCi0ASTUj4LapRRtDfj57Ja4IhPmg2fls28uVOPbAn8N+JifaOumN2UG3oEO/Ixek2A4NcYSA==", - "requires": { - "@actions/io": "^1.0.1" - } - }, "@actions/http-client": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-1.0.1.tgz", - "integrity": "sha512-vy5DhqTJ1gtEkpRrD/6BHhUlkeyccrOX0BT9KmtO5TWxe5KSSwVHFE+J15Z0dG+tJwZJ/nHC4slUIyqpkahoMg==" - }, - "@actions/io": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.0.2.tgz", - "integrity": "sha512-J8KuFqVPr3p6U8W93DOXlXW6zFvrQAJANdS+vw0YhusLIq+bszW8zmK2Fh1C2kDPX8FMvwIl1OUcFgvJoXLbAg==" + "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-1.0.2.tgz", + "integrity": "sha512-ngdGx7aXM7i9BFT+7e3RWWAEt3bX4tKrdI5w5hf0wYpHz66u5Nw6AFSFXG5wzQyUQbkgeNRnJZyK2zciGqXgrQ==", + "requires": { + "tunnel": "0.0.6" + } }, "@types/nock": { "version": "10.0.3", @@ -194,6 +179,11 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" }, + "tunnel": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz", + "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==" + }, "type-detect": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", diff --git a/package.json b/package.json index 990c5d8..a9d1045 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@actions/tool-cache", - "version": "1.3.0", + "version": "1.3.1", "description": "Actions tool-cache lib", "keywords": [ "github", @@ -38,7 +38,7 @@ "dependencies": { "@actions/core": "^1.2.0", "@actions/exec": "^1.0.0", - "@actions/http-client": "^1.0.1", + "@actions/http-client": "^1.0.2", "@actions/io": "^1.0.1", "semver": "^6.1.0", "uuid": "^3.3.2" diff --git a/src/tool-cache.ts b/src/tool-cache.ts index b91cf1a..6e8c6c2 100644 --- a/src/tool-cache.ts +++ b/src/tool-cache.ts @@ -5,7 +5,7 @@ import * as os from 'os' import * as path from 'path' import * as httpm from '@actions/http-client' import * as semver from 'semver' -import * as uuidV4 from 'uuid/v4' +import uuidV4 from 'uuid/v4' import {exec} from '@actions/exec/lib/exec' import {ExecOptions} from '@actions/exec/lib/interfaces' import {ok} from 'assert'