diff --git a/.github/workflows/regression-checks.yml b/.github/workflows/regression-checks.yml index 04f4bc50..5c49db60 100644 --- a/.github/workflows/regression-checks.yml +++ b/.github/workflows/regression-checks.yml @@ -49,3 +49,28 @@ jobs: - run: | set -x python -c "import sys; assert f'{sys.version_info.major}.{sys.version_info.minor}' == '${{ matrix.python-version }}'" + + issue-324: + runs-on: windows-latest + 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 + ) diff --git a/dist/setup/index.js b/dist/setup/index.js index 6b2f6d59..65142ce4 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -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); diff --git a/src/conda.ts b/src/conda.ts index 15f3a1b4..3cf527a9 100644 --- a/src/conda.ts +++ b/src/conda.ts @@ -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 };