Skip to content
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

Jump to bottom

Fix env activation on win (a v3 regression) due to hard-coded install PATH #325

Merged
merged 2 commits into from
Nov 29, 2023
Merged

Fix env activation on win (a v3 regression) due to hard-coded install PATH #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aeb00f7
Fix env activation on win (a v3 regression) due to hard-coded install…
dbast Nov 29, 2023
e7c89c5
Prevent fork runs
dbast Nov 29, 2023
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
30 changes: 30 additions & 0 deletions .github/workflows/regression-checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,33 @@ jobs:
- run: |
set -x
python -c "import sys; assert f'{sys.version_info.major}.{sys.version_info.minor}' == '${{ matrix.python-version }}'"

issue-324:
# prevent cronjobs from running on forks
if:
(github.event_name == 'schedule' && github.repository ==
'conda-incubator/setup-miniconda') || (github.event_name != 'schedule')
runs-on: windows-latest
name: Issue 324
steps:
- uses: actions/checkout@v4
- uses: ./
with:
activate-environment: test-env
miniforge-version: latest
auto-update-conda: true
conda-solver: libmamba
- name: windows debug
shell: cmd /C CALL {0}
run: >-
conda info && conda list && set

- name: test for correct environment being activated
shell: cmd /C CALL {0}
run: >-
if "%CONDA_DEFAULT_ENV%" == "test-env" (
echo "test-env activated"
) else (
echo "test-env not activated"
exit 1
)
6 changes: 3 additions & 3 deletions dist/setup/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47495,9 +47495,9 @@ function condaInit(inputs, options) {
}
else {
extraShells = {
"C:/Miniconda3/etc/profile.d/conda.sh": bashExtraText,
"C:/Miniconda3/etc/fish/conf.d/conda.fish": bashExtraText,
"C:/Miniconda3/condabin/conda_hook.bat": batchExtraText,
"~/miniconda3/etc/profile.d/conda.sh": bashExtraText,
"~/miniconda3/etc/fish/conf.d/conda.fish": bashExtraText,
"~/miniconda3/condabin/conda_hook.bat": batchExtraText,
};
}
const allShells = Object.assign(Object.assign({}, shells), extraShells);
Expand Down
6 changes: 3 additions & 3 deletions src/conda.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,9 +285,9 @@ export async function condaInit(
};
} else {
extraShells = {
"C:/Miniconda3/etc/profile.d/conda.sh": bashExtraText,
"C:/Miniconda3/etc/fish/conf.d/conda.fish": bashExtraText,
"C:/Miniconda3/condabin/conda_hook.bat": batchExtraText,
"~/miniconda3/etc/profile.d/conda.sh": bashExtraText,
"~/miniconda3/etc/fish/conf.d/conda.fish": bashExtraText,
"~/miniconda3/condabin/conda_hook.bat": batchExtraText,
};
}
const allShells: types.IShells = { ...shells, ...extraShells };
Expand Down
Loading