File tree Expand file tree Collapse file tree 2 files changed +60
-2
lines changed Expand file tree Collapse file tree 2 files changed +60
-2
lines changed Original file line number Diff line number Diff line change @@ -240,13 +240,45 @@ export async function applyCondaConfiguration(
240
240
options ,
241
241
) ;
242
242
}
243
+ // auto_activate_base was renamed to auto_activate in 25.5.0
244
+ core . info ( `auto_activate: ${ inputs . condaConfig . auto_activate_base } ` ) ;
245
+ try {
246
+ // 25.5.0+
247
+ await condaCommand (
248
+ [
249
+ "config" ,
250
+ "--set" ,
251
+ "auto_activate" ,
252
+ inputs . condaConfig . auto_activate_base ,
253
+ ] ,
254
+ inputs ,
255
+ options ,
256
+ ) ;
257
+ } catch ( err ) {
258
+ try {
259
+ // <25.5.0
260
+ await condaCommand (
261
+ [
262
+ "config" ,
263
+ "--set" ,
264
+ "auto_activate_base" ,
265
+ inputs . condaConfig . auto_activate_base ,
266
+ ] ,
267
+ inputs ,
268
+ options ,
269
+ ) ;
270
+ } catch ( err2 ) {
271
+ core . warning ( err2 as Error ) ;
272
+ }
273
+ }
243
274
244
275
// All other options are just passed as their string representations
245
276
for ( const [ key , value ] of configEntries ) {
246
277
if (
247
278
value . trim ( ) . length === 0 ||
248
279
key === "channels" ||
249
- key === "pkgs_dirs"
280
+ key === "pkgs_dirs" ||
281
+ key === "auto_activate_base"
250
282
) {
251
283
continue ;
252
284
}
You can’t perform that action at this time.
0 commit comments