Skip to content

Commit 8706aa7

Browse files
authored
Fix env activation on win (a v3 regression) due to hard-coded install PATH (#325)
* Fix env activation on win (a v3 regression) due to hard-coded install PATH * Prevent fork runs
1 parent c585a97 commit 8706aa7

File tree

3 files changed

+36
-6
lines changed

3 files changed

+36
-6
lines changed

.github/workflows/regression-checks.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,33 @@ jobs:
4949
- run: |
5050
set -x
5151
python -c "import sys; assert f'{sys.version_info.major}.{sys.version_info.minor}' == '${{ matrix.python-version }}'"
52+
53+
issue-324:
54+
# prevent cronjobs from running on forks
55+
if:
56+
(github.event_name == 'schedule' && github.repository ==
57+
'conda-incubator/setup-miniconda') || (github.event_name != 'schedule')
58+
runs-on: windows-latest
59+
name: Issue 324
60+
steps:
61+
- uses: actions/checkout@v4
62+
- uses: ./
63+
with:
64+
activate-environment: test-env
65+
miniforge-version: latest
66+
auto-update-conda: true
67+
conda-solver: libmamba
68+
- name: windows debug
69+
shell: cmd /C CALL {0}
70+
run: >-
71+
conda info && conda list && set
72+
73+
- name: test for correct environment being activated
74+
shell: cmd /C CALL {0}
75+
run: >-
76+
if "%CONDA_DEFAULT_ENV%" == "test-env" (
77+
echo "test-env activated"
78+
) else (
79+
echo "test-env not activated"
80+
exit 1
81+
)

dist/setup/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47495,9 +47495,9 @@ function condaInit(inputs, options) {
4749547495
}
4749647496
else {
4749747497
extraShells = {
47498-
"C:/Miniconda3/etc/profile.d/conda.sh": bashExtraText,
47499-
"C:/Miniconda3/etc/fish/conf.d/conda.fish": bashExtraText,
47500-
"C:/Miniconda3/condabin/conda_hook.bat": batchExtraText,
47498+
"~/miniconda3/etc/profile.d/conda.sh": bashExtraText,
47499+
"~/miniconda3/etc/fish/conf.d/conda.fish": bashExtraText,
47500+
"~/miniconda3/condabin/conda_hook.bat": batchExtraText,
4750147501
};
4750247502
}
4750347503
const allShells = Object.assign(Object.assign({}, shells), extraShells);

src/conda.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -285,9 +285,9 @@ export async function condaInit(
285285
};
286286
} else {
287287
extraShells = {
288-
"C:/Miniconda3/etc/profile.d/conda.sh": bashExtraText,
289-
"C:/Miniconda3/etc/fish/conf.d/conda.fish": bashExtraText,
290-
"C:/Miniconda3/condabin/conda_hook.bat": batchExtraText,
288+
"~/miniconda3/etc/profile.d/conda.sh": bashExtraText,
289+
"~/miniconda3/etc/fish/conf.d/conda.fish": bashExtraText,
290+
"~/miniconda3/condabin/conda_hook.bat": batchExtraText,
291291
};
292292
}
293293
const allShells: types.IShells = { ...shells, ...extraShells };

0 commit comments

Comments
 (0)