From 7c9cb691c025260fb6374820d91c387d2af01e52 Mon Sep 17 00:00:00 2001 From: Jeff Newman Date: Thu, 29 Aug 2024 13:07:07 -0500 Subject: [PATCH 1/5] change installer miniconda to v3 --- .github/workflows/build_installer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_installer.yml b/.github/workflows/build_installer.yml index ca8b0fd52..cad2299ab 100644 --- a/.github/workflows/build_installer.yml +++ b/.github/workflows/build_installer.yml @@ -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') From d2f51239f45870456f1cefad048547f0603ef2cd Mon Sep 17 00:00:00 2001 From: Jeff Newman Date: Thu, 29 Aug 2024 13:20:25 -0500 Subject: [PATCH 2/5] assume activation --- .github/workflows/build_installer.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build_installer.yml b/.github/workflows/build_installer.yml index cad2299ab..9b0b7b874 100644 --- a/.github/workflows/build_installer.yml +++ b/.github/workflows/build_installer.yml @@ -41,7 +41,6 @@ jobs: run: | export ACTIVITYSIM_VERSION=${{ inputs.version }} export EXT=exe - source /c/Miniconda3/Scripts/activate; source other_resources/installer/build_win.sh; ls -alh build shell: bash From fbc95e9a96bbd818b0b7d32f4854220fe5b7216f Mon Sep 17 00:00:00 2001 From: Jeff Newman Date: Thu, 29 Aug 2024 13:34:11 -0500 Subject: [PATCH 3/5] conda bootup --- other_resources/installer/build.sh | 2 ++ other_resources/installer/build_win.sh | 1 + 2 files changed, 3 insertions(+) diff --git a/other_resources/installer/build.sh b/other_resources/installer/build.sh index e30ce1a99..7a6de3735 100644 --- a/other_resources/installer/build.sh +++ b/other_resources/installer/build.sh @@ -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}}" diff --git a/other_resources/installer/build_win.sh b/other_resources/installer/build_win.sh index 433462c02..1a7013918 100644 --- a/other_resources/installer/build_win.sh +++ b/other_resources/installer/build_win.sh @@ -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 From c887c3efaec9037fc46f69735ae56d11fc70f607 Mon Sep 17 00:00:00 2001 From: Jeff Newman Date: Thu, 29 Aug 2024 13:41:03 -0500 Subject: [PATCH 4/5] conda activate --- .github/workflows/build_installer.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_installer.yml b/.github/workflows/build_installer.yml index 9b0b7b874..e6efa4814 100644 --- a/.github/workflows/build_installer.yml +++ b/.github/workflows/build_installer.yml @@ -41,6 +41,7 @@ jobs: run: | export ACTIVITYSIM_VERSION=${{ inputs.version }} export EXT=exe + source /c/Users/runneradmin/miniconda3/Scripts/activate; source other_resources/installer/build_win.sh; ls -alh build shell: bash From 5db5a7d8eb982d275edf4008e27b775b7cae46ad Mon Sep 17 00:00:00 2001 From: Jeff Newman Date: Thu, 29 Aug 2024 13:46:42 -0500 Subject: [PATCH 5/5] ncis >= 3.01 --- other_resources/installer/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/other_resources/installer/build.sh b/other_resources/installer/build.sh index 7a6de3735..973cbd4d8 100644 --- a/other_resources/installer/build.sh +++ b/other_resources/installer/build.sh @@ -21,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