Skip to content

Commit 03ed28e

Browse files
committed
use platform-specific artefact generation code on win
1 parent 7f663e5 commit 03ed28e

File tree

3 files changed

+88
-6
lines changed

3 files changed

+88
-6
lines changed

.github/workflows/conda-build.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,10 @@ jobs:
140140
set "sha=%GITHUB_SHA%"
141141
call ".scripts\run_win_build.bat"
142142
env:
143+
# default value; make explicit for now (pending smithy-improvements),
144+
# as it needs to be synchronized with artefact generation below; see
145+
# https://github.com/conda-forge/conda-smithy/issues/2345
146+
CONDA_BLD_DIR: C:\bld
143147
MINIFORGE_HOME: D:\Miniforge
144148
PYTHONUNBUFFERED: 1
145149
CONFIG: ${{ matrix.CONFIG }}
@@ -158,7 +162,6 @@ jobs:
158162
CONFIG: ${{ matrix.CONFIG }}
159163
SHORT_CONFIG: ${{ matrix.SHORT_CONFIG }}
160164
OS: ${{ matrix.os }}
161-
MINIFORGE_HOME_WIN: D:\Miniforge
162165
run: |
163166
export CI=github_actions
164167
export CI_RUN_ID=$GITHUB_RUN_ID
@@ -167,7 +170,8 @@ jobs:
167170
if [ $OS == "macos" ]; then
168171
export CONDA_BLD_DIR="${MINIFORGE_HOME:-${HOME}/miniforge3}/conda-bld"
169172
elif [ $OS == "windows" ]; then
170-
export CONDA_BLD_DIR="${MINIFORGE_HOME_WIN//\\//}/conda-bld"
173+
# this should be populated consistently by smithy, see above
174+
export CONDA_BLD_DIR="C:\\bld"
171175
else
172176
export CONDA_BLD_DIR="build_artifacts"
173177
fi
@@ -185,7 +189,11 @@ jobs:
185189
# we do not want to trigger artefact creation if the job is cancelled;
186190
# gate this on either explicit success or failure
187191
if [ $JOB_STATUS == "failure" || $JOB_STATUS == "success" ]; then
188-
./.scripts/create_conda_build_artifacts.sh
192+
if [ $OS == "windows" ]; then
193+
cmd.exe /c .scripts\\create_conda_build_artifacts.bat
194+
else
195+
./.scripts/create_conda_build_artifacts.sh
196+
fi
189197
else
190198
# skips upload steps below, which are gated on preparation success
191199
exit 1

.scripts/create_conda_build_artifacts.bat

Lines changed: 77 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conda-forge.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ azure:
22
free_disk_space: true
33
settings_linux:
44
timeoutInMinutes: 1
5-
settings_win:
6-
variables:
7-
CONDA_BLD_PATH: C:\\bld\\
85
bot:
96
abi_migration_branches:
107
- v2.6.x

0 commit comments

Comments
 (0)