Skip to content

Commit 7b80289

Browse files
swap357swap357
authored
Merge pull request #10867 from swap357/cherry_pick_win-arm64_fix
Cherry pick win-arm64 CI fix to release0.68
2 parents e07298e + 951118d commit 7b80289

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

‎.github/workflows/numba_win-arm64_conda_builder.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
run: |
5656
export CONDA_PREFIX="${RUNNER_TEMP}/conda-base"
5757
"${CONDA_EXE}" create --prefix "${CONDA_PREFIX}" \
58-
-c "${WIN_ARM64_CONDA_CHANNEL}" -c m2-winarm64 -c main \
58+
-c main \
5959
--yes conda-build
6060
echo "CONDA_PREFIX=${CONDA_PREFIX}" >> "${GITHUB_ENV}"
6161
echo "${CONDA_PREFIX}" >> "${GITHUB_PATH}"
@@ -92,7 +92,7 @@ jobs:
9292
fi
9393
9494
conda-build -c $LLVMLITE_CHANNEL "${extra_args[@]}" \
95-
-c "${WIN_ARM64_CONDA_CHANNEL}" -c m2-winarm64 -c defaults \
95+
-c defaults \
9696
--python=${PYTHON_VERSION} \
9797
--numpy=${NUMPY_VERSION} \
9898
buildscripts/condarecipe.local/ \
@@ -142,7 +142,7 @@ jobs:
142142
run: |
143143
export CONDA_PREFIX="${RUNNER_TEMP}/conda-base"
144144
"${CONDA_EXE}" create --prefix "${CONDA_PREFIX}" \
145-
-c "${WIN_ARM64_CONDA_CHANNEL}" -c m2-winarm64 -c main \
145+
-c main \
146146
--yes conda-build
147147
echo "CONDA_PREFIX=${CONDA_PREFIX}" >> "${GITHUB_ENV}"
148148
echo "${CONDA_PREFIX}" >> "${GITHUB_PATH}"
@@ -190,7 +190,7 @@ jobs:
190190
fi
191191
192192
conda-build -c $LLVMLITE_CHANNEL "${extra_args[@]}" \
193-
-c "${WIN_ARM64_CONDA_CHANNEL}" -c m2-winarm64 -c defaults \
193+
-c defaults \
194194
--python=${PYTHON_VERSION} \
195195
--extra-deps numpy=${NUMPY_VERSION} \
196196
--test \

‎.github/workflows/numba_win-arm64_wheel_builder.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
run: |
6868
export CONDA_PREFIX="${RUNNER_TEMP}/conda-build-env"
6969
"${CONDA_EXE}" create --prefix "${CONDA_PREFIX}" \
70-
-c "${WIN_ARM64_CONDA_CHANNEL}" -c m2-winarm64 -c main \
70+
-c main \
7171
--yes "python=${PYTHON_VERSION}" pip tbb-devel
7272
echo "CONDA_PREFIX=${CONDA_PREFIX}" >> "${GITHUB_ENV}"
7373
export PATH="${CONDA_PREFIX}/Scripts:${CONDA_PREFIX}/Library/bin:${CONDA_PREFIX}:${PATH}"
@@ -139,7 +139,7 @@ jobs:
139139
run: |
140140
export CONDA_PREFIX="${RUNNER_TEMP}/conda-base"
141141
"${CONDA_EXE}" create --prefix "${CONDA_PREFIX}" \
142-
-c "${WIN_ARM64_CONDA_CHANNEL}" -c m2-winarm64 -c main \
142+
-c main \
143143
--yes "python=${PYTHON_VERSION}" pip wheel tbb
144144
echo "CONDA_PREFIX=${CONDA_PREFIX}" >> "${GITHUB_ENV}"
145145
export PATH="${CONDA_PREFIX}/Scripts:${CONDA_PREFIX}/Library/bin:${CONDA_PREFIX}:${PATH}"

0 commit comments

Comments
 (0)