From 27f1202362190be38552257514ff52a88904d895 Mon Sep 17 00:00:00 2001 From: Rob Anderson Date: Wed, 30 Oct 2024 14:41:34 -0700 Subject: [PATCH] set CONDA environment variable regardless of useBundled option (#350) --- dist/setup/index.js | 6 ++---- src/outputs.ts | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dist/setup/index.js b/dist/setup/index.js index 6e625ba2..705f3136 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -48905,10 +48905,8 @@ function setPathVariables(inputs, options) { const condaPath = conda.condaBasePath(inputs, options); core.info(`Add "${condaBin}" to PATH`); core.addPath(condaBin); - if (!options.useBundled) { - core.info(`Set 'CONDA="${condaPath}"'`); - core.exportVariable("CONDA", condaPath); - } + core.info(`Set 'CONDA="${condaPath}"'`); + core.exportVariable("CONDA", condaPath); }); } exports.setPathVariables = setPathVariables; diff --git a/src/outputs.ts b/src/outputs.ts index 61d33a07..cb1aa6c0 100644 --- a/src/outputs.ts +++ b/src/outputs.ts @@ -23,10 +23,8 @@ export async function setPathVariables( const condaPath: string = conda.condaBasePath(inputs, options); core.info(`Add "${condaBin}" to PATH`); core.addPath(condaBin); - if (!options.useBundled) { - core.info(`Set 'CONDA="${condaPath}"'`); - core.exportVariable("CONDA", condaPath); - } + core.info(`Set 'CONDA="${condaPath}"'`); + core.exportVariable("CONDA", condaPath); } /**