New tool cache (#8)

* Consume new tool-cache

* Fix tests

* Fix workflow
This commit is contained in:
Danny McCormick 2019-07-30 12:53:06 -04:00 committed by GitHub
parent 594da1d3f0
commit 1acab72798
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 7706 additions and 7705 deletions

View File

@ -7,8 +7,8 @@ import httpClient = require('typed-rest-client/HttpClient');
const toolDir = path.join(__dirname, 'runner', 'tools'); const toolDir = path.join(__dirname, 'runner', 'tools');
const tempDir = path.join(__dirname, 'runner', 'temp'); const tempDir = path.join(__dirname, 'runner', 'temp');
process.env['RUNNER_TOOLSDIRECTORY'] = toolDir; process.env['RUNNER_TOOL_CACHE'] = toolDir;
process.env['RUNNER_TEMPDIRECTORY'] = tempDir; process.env['RUNNER_TEMP'] = tempDir;
import * as installer from '../src/installer'; import * as installer from '../src/installer';
const IS_WINDOWS = process.platform === 'win32'; const IS_WINDOWS = process.platform === 'win32';

View File

@ -29,8 +29,8 @@ exports.HTTPError = HTTPError;
const IS_WINDOWS = process.platform === 'win32'; const IS_WINDOWS = process.platform === 'win32';
const userAgent = 'actions/tool-cache'; const userAgent = 'actions/tool-cache';
// On load grab temp directory and cache directory and remove them from env (currently don't want to expose this) // On load grab temp directory and cache directory and remove them from env (currently don't want to expose this)
let tempDirectory = process.env['RUNNER_TEMPDIRECTORY'] || ''; let tempDirectory = process.env['RUNNER_TEMP'] || '';
let cacheRoot = process.env['RUNNER_TOOLSDIRECTORY'] || ''; let cacheRoot = process.env['RUNNER_TOOL_CACHE'] || '';
// If directories not found, place them in common temp locations // If directories not found, place them in common temp locations
if (!tempDirectory || !cacheRoot) { if (!tempDirectory || !cacheRoot) {
let baseLocation; let baseLocation;

File diff suppressed because one or more lines are too long

View File

@ -2,7 +2,7 @@
"_from": "file:toolkit\\actions-tool-cache-0.0.0.tgz", "_from": "file:toolkit\\actions-tool-cache-0.0.0.tgz",
"_id": "@actions/tool-cache@0.0.0", "_id": "@actions/tool-cache@0.0.0",
"_inBundle": false, "_inBundle": false,
"_integrity": "sha512-NavDg5VFXDfbe9TpFuj+uOHacjg1bT3Wmo3DQuul3gsGRBEXyzhh2MWKnBZs/Zh7FE3prLmIqpbtymafNBFkIA==", "_integrity": "sha512-CCJjXKGfqR34oo1mgKpUk63g3fcoIq+aNJBZ7b73aWGot0ddju2cefJrKjhEun4FI7gYsLYg+ayAUnbFwkGd4Q==",
"_location": "/@actions/tool-cache", "_location": "/@actions/tool-cache",
"_phantomChildren": {}, "_phantomChildren": {},
"_requested": { "_requested": {
@ -17,10 +17,11 @@
"fetchSpec": "C:\\Users\\damccorm\\Documents\\setup-dotnet\\toolkit\\actions-tool-cache-0.0.0.tgz" "fetchSpec": "C:\\Users\\damccorm\\Documents\\setup-dotnet\\toolkit\\actions-tool-cache-0.0.0.tgz"
}, },
"_requiredBy": [ "_requiredBy": [
"#USER",
"/" "/"
], ],
"_resolved": "C:\\Users\\damccorm\\Documents\\setup-dotnet\\toolkit\\actions-tool-cache-0.0.0.tgz", "_resolved": "C:\\Users\\damccorm\\Documents\\setup-dotnet\\toolkit\\actions-tool-cache-0.0.0.tgz",
"_shasum": "fa216c10f724010a74602fd14881f25f5b008070", "_shasum": "223a115ab2782ba0a7ad4a0a829030b9cb84eade",
"_spec": "@actions/tool-cache@file:toolkit/actions-tool-cache-0.0.0.tgz", "_spec": "@actions/tool-cache@file:toolkit/actions-tool-cache-0.0.0.tgz",
"_where": "C:\\Users\\damccorm\\Documents\\setup-dotnet", "_where": "C:\\Users\\damccorm\\Documents\\setup-dotnet",
"bugs": { "bugs": {

2
package-lock.json generated
View File

@ -25,7 +25,7 @@
}, },
"@actions/tool-cache": { "@actions/tool-cache": {
"version": "file:toolkit/actions-tool-cache-0.0.0.tgz", "version": "file:toolkit/actions-tool-cache-0.0.0.tgz",
"integrity": "sha512-NavDg5VFXDfbe9TpFuj+uOHacjg1bT3Wmo3DQuul3gsGRBEXyzhh2MWKnBZs/Zh7FE3prLmIqpbtymafNBFkIA==", "integrity": "sha512-CCJjXKGfqR34oo1mgKpUk63g3fcoIq+aNJBZ7b73aWGot0ddju2cefJrKjhEun4FI7gYsLYg+ayAUnbFwkGd4Q==",
"requires": { "requires": {
"@actions/core": "^0.0.0", "@actions/core": "^0.0.0",
"@actions/exec": "^0.0.0", "@actions/exec": "^0.0.0",

Binary file not shown.