Skip to content

Commit

Permalink
Fix installer (#887)
Browse files Browse the repository at this point in the history
* change installer miniconda to v3

* assume activation

* conda bootup

* conda activate

* ncis >= 3.01
  • Loading branch information
jpn-- authored Sep 2, 2024
1 parent bc5b6c3 commit 69038fc
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build_installer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Checkout code
uses: actions/checkout@v3

- uses: conda-incubator/setup-miniconda@35d1405e78aa3f784fe3ce9a2eb378d5eeb62169
- uses: conda-incubator/setup-miniconda@v3
with:
miniconda-version: "latest"
if: contains(matrix.OS_NAME, 'Windows')
Expand All @@ -41,7 +41,7 @@ jobs:
run: |
export ACTIVITYSIM_VERSION=${{ inputs.version }}
export EXT=exe
source /c/Miniconda3/Scripts/activate;
source /c/Users/runneradmin/miniconda3/Scripts/activate;
source other_resources/installer/build_win.sh;
ls -alh build
shell: bash
Expand Down
4 changes: 3 additions & 1 deletion other_resources/installer/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ set -xe

env | sort

eval "$(command conda 'shell.bash' 'hook' 2> /dev/null)"

echo "***** Start: Building Activitysim installer *****"
CONSTRUCT_ROOT="${CONSTRUCT_ROOT:-${PWD}}"

Expand All @@ -19,7 +21,7 @@ if [[ "$(uname)" == "Darwin" ]]; then
fi
# shellcheck disable=SC2154
if [[ "${TARGET_PLATFORM}" == win-* ]]; then
conda install -y "nsis=3.01" -c conda-forge --override-channels
conda install -y "nsis>=3.01" -c conda-forge --override-channels
fi
# pip install git+git://github.com/conda/constructor@3.3.1#egg=constructor --force --no-deps
conda list
Expand Down
1 change: 1 addition & 0 deletions other_resources/installer/build_win.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@

set -ex

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

0 comments on commit 69038fc

Please sign in to comment.