Skip to content

Force TOOLCACHE_ROOT to be equal AGENT_TOOLSDIRECTORY #338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marko-zivic-93 merged 4 commits into from Apr 15, 2022
Merged

Force TOOLCACHE_ROOT to be equal AGENT_TOOLSDIRECTORY #338

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3250b53
Force RUNNER_TOOL_CACHE to be equal AGENT_TOOLSDIRECTORY
Feb 17, 2022
011c443
prettier
Feb 17, 2022
65fe6a8
Use template literals instead of string concatenation
Feb 21, 2022
f4b66de
Merge branch 'actions:main' into main
dsame Apr 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use template literals instead of string concatenation
  • Loading branch information
Sergey Dolin authored Feb 21, 2022
commit 65fe6a82c70776c8d39cb6ec21b08db2c4a6fe24
9 changes: 4 additions & 5 deletions dist/setup/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6644,15 +6644,14 @@ function cacheDependencies(cache, pythonVersion) {
});
}
function run() {
var _a;
return __awaiter(this, void 0, void 0, function* () {
if (process.env['AGENT_TOOLSDIRECTORY'] !== undefined) {
core.debug('Python is expected to be installed into AGENT_TOOLSDIRECTORY=' +
process.env['AGENT_TOOLSDIRECTORY']);
if ((_a = process.env.AGENT_TOOLSDIRECTORY) === null || _a === void 0 ? void 0 : _a.trim()) {
core.debug(`Python is expected to be installed into AGENT_TOOLSDIRECTORY=${process.env['AGENT_TOOLSDIRECTORY']}`);
process.env['RUNNER_TOOL_CACHE'] = process.env['AGENT_TOOLSDIRECTORY'];
}
else {
core.debug('Python is expected to be installed into RUNNER_TOOL_CACHE=' +
process.env['RUNNER_TOOL_CACHE']);
core.debug(`Python is expected to be installed into RUNNER_TOOL_CACHE==${process.env['RUNNER_TOOL_CACHE']}`);
}
try {
const version = core.getInput('python-version');
Expand Down
8 changes: 3 additions & 5 deletions src/setup-python.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,14 @@ async function cacheDependencies(cache: string, pythonVersion: string) {
}

async function run() {
if (process.env['AGENT_TOOLSDIRECTORY'] !== undefined) {
if (process.env.AGENT_TOOLSDIRECTORY?.trim()) {
core.debug(
'Python is expected to be installed into AGENT_TOOLSDIRECTORY=' +
process.env['AGENT_TOOLSDIRECTORY']
`Python is expected to be installed into AGENT_TOOLSDIRECTORY=${process.env['AGENT_TOOLSDIRECTORY']}`
);
process.env['RUNNER_TOOL_CACHE'] = process.env['AGENT_TOOLSDIRECTORY'];
} else {
core.debug(
'Python is expected to be installed into RUNNER_TOOL_CACHE=' +
process.env['RUNNER_TOOL_CACHE']
`Python is expected to be installed into RUNNER_TOOL_CACHE==${process.env['RUNNER_TOOL_CACHE']}`
);
}
try {
Expand Down