actions
/
toolkit
mirror of https://github.com/actions/toolkit
1
0
Fork 0
Code

Check the right variables (#35)

pull/37/head
Danny McCormick 2019-07-30 12:31:36 -04:00 committed by GitHub
parent 2a2b51f939
commit 5218a83722
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/tool-cache/__tests__/tool-cache.test.ts
View File

@ -7,8 +7,8 @@ import * as exec from '@actions/exec'
const cachePath = path.join(__dirname, 'CACHE')
const tempPath = path.join(__dirname, 'TEMP')
// Set temp and tool directories before importing (used to set global state)
process.env['RUNNER_TEMPDIRECTORY'] = tempPath
process.env['RUNNER_TOOLSDIRECTORY'] = cachePath
process.env['RUNNER_TEMP'] = tempPath
process.env['RUNNER_TOOL_CACHE'] = cachePath
// eslint-disable-next-line import/first
import * as tc from '../src/tool-cache'

4
packages/tool-cache/src/tool-cache.ts
View File

@ -21,8 +21,8 @@ const IS_WINDOWS = process.platform === 'win32'
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)
let tempDirectory: string = process.env['RUNNER_TEMPDIRECTORY'] || ''
let cacheRoot: string = process.env['RUNNER_TOOLSDIRECTORY'] || ''
let tempDirectory: string = process.env['RUNNER_TEMP'] || ''
let cacheRoot: string = process.env['RUNNER_TOOL_CACHE'] || ''
// If directories not found, place them in common temp locations
if (!tempDirectory || !cacheRoot) {
let baseLocation: string