From 5e9859af2b2cbe27684446ec00e13a1a2be77170 Mon Sep 17 00:00:00 2001 From: Nick Gregory Date: Tue, 25 Feb 2025 17:33:24 +0000 Subject: [PATCH 1/4] correct extra files ref issue introduced in 0c80f9b --- constructor/nsis/main.nsi.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/constructor/nsis/main.nsi.tmpl b/constructor/nsis/main.nsi.tmpl index 59f35abee..9b94d3e8a 100644 --- a/constructor/nsis/main.nsi.tmpl +++ b/constructor/nsis/main.nsi.tmpl @@ -1265,7 +1265,7 @@ Section "Install" File {{ conda_exe }} File {{ pre_uninstall }} -{%- for path, files in extra_files | items %} +{%- for path, files in EXTRA_FILES | items %} SetOutPath {{ path }} {%- for file in files %} File {{ file }} From 5f4a9b807e0cf7e9a7974d00aabb2d18125ec6c4 Mon Sep 17 00:00:00 2001 From: Nick Gregory Date: Tue, 25 Feb 2025 17:46:50 +0000 Subject: [PATCH 2/4] update news --- news/942-fix-win-extra_files | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 news/942-fix-win-extra_files diff --git a/news/942-fix-win-extra_files b/news/942-fix-win-extra_files new file mode 100644 index 000000000..c317176e1 --- /dev/null +++ b/news/942-fix-win-extra_files @@ -0,0 +1,19 @@ +### Enhancements + +* + +### Bug fixes + +* Fix extra_file functionality on exe installers. (#942) + +### Deprecations + +* + +### Docs + +* + +### Other + +* From 93a7561e8375ed318cd2bab50bb7e6918f6ce568 Mon Sep 17 00:00:00 2001 From: NixM0nk3y Date: Sat, 1 Mar 2025 12:19:41 +0000 Subject: [PATCH 3/4] Update news/942-fix-win-extra_files Co-authored-by: jaimergp --- news/942-fix-win-extra_files | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/news/942-fix-win-extra_files b/news/942-fix-win-extra_files index c317176e1..2e539a8aa 100644 --- a/news/942-fix-win-extra_files +++ b/news/942-fix-win-extra_files @@ -4,7 +4,7 @@ ### Bug fixes -* Fix extra_file functionality on exe installers. (#942) +* Fix `extra_files` functionality on EXE installers. (#942) ### Deprecations From 222833b02705cccc95ca5b3a3cfc9c32dd5c8ef0 Mon Sep 17 00:00:00 2001 From: Nick Gregory Date: Mon, 3 Mar 2025 17:54:17 +0000 Subject: [PATCH 4/4] raise errors in tests on EXE installs --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d182517c5..18e573b57 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -105,6 +105,7 @@ jobs: && files+=(--file "dev/extra-requirements-${{ runner.os }}.txt") conda install ${files[@]} -y echo "NSIS_USING_LOG_BUILD=1" >> $GITHUB_ENV + echo "NSIS_SCRIPTS_RAISE_ERRORS=1" >> $GITHUB_ENV pip install -e . --no-deps --no-build-isolation - name: Set up conda executable run: |