Skip to content

Commit 69038fc

Browse files
authored
Fix installer (#887)
* change installer miniconda to v3 * assume activation * conda bootup * conda activate * ncis >= 3.01
1 parent bc5b6c3 commit 69038fc

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

.github/workflows/build_installer.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Checkout code
2929
uses: actions/checkout@v3
3030

31-
- uses: conda-incubator/setup-miniconda@35d1405e78aa3f784fe3ce9a2eb378d5eeb62169
31+
- uses: conda-incubator/setup-miniconda@v3
3232
with:
3333
miniconda-version: "latest"
3434
if: contains(matrix.OS_NAME, 'Windows')
@@ -41,7 +41,7 @@ jobs:
4141
run: |
4242
export ACTIVITYSIM_VERSION=${{ inputs.version }}
4343
export EXT=exe
44-
source /c/Miniconda3/Scripts/activate;
44+
source /c/Users/runneradmin/miniconda3/Scripts/activate;
4545
source other_resources/installer/build_win.sh;
4646
ls -alh build
4747
shell: bash

other_resources/installer/build.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ set -xe
44

55
env | sort
66

7+
eval "$(command conda 'shell.bash' 'hook' 2> /dev/null)"
8+
79
echo "***** Start: Building Activitysim installer *****"
810
CONSTRUCT_ROOT="${CONSTRUCT_ROOT:-${PWD}}"
911

@@ -19,7 +21,7 @@ if [[ "$(uname)" == "Darwin" ]]; then
1921
fi
2022
# shellcheck disable=SC2154
2123
if [[ "${TARGET_PLATFORM}" == win-* ]]; then
22-
conda install -y "nsis=3.01" -c conda-forge --override-channels
24+
conda install -y "nsis>=3.01" -c conda-forge --override-channels
2325
fi
2426
# pip install git+git://github.com/conda/[email protected]#egg=constructor --force --no-deps
2527
conda list

other_resources/installer/build_win.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22

33
set -ex
44

5+
eval "$(command conda 'shell.bash' 'hook' 2> /dev/null)"
56
conda install posix --yes
67
source other_resources/installer/build.sh

0 commit comments

Comments
 (0)