From 1b696a2dbcea0bf87c306d362d70a515f3e12416 Mon Sep 17 00:00:00 2001 From: Jan Tilly Date: Sat, 14 Oct 2023 20:23:17 +0200 Subject: [PATCH] Use subdir. --- .github/workflows/build-wheels.yml | 1 + build_tools/prepare_macos_wheel.sh | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml index fe4566f4..081f01b1 100644 --- a/.github/workflows/build-wheels.yml +++ b/.github/workflows/build-wheels.yml @@ -1,6 +1,7 @@ name: Build and upload to PyPI on: + push: pull_request: release: types: diff --git a/build_tools/prepare_macos_wheel.sh b/build_tools/prepare_macos_wheel.sh index caa8e1dc..3a7949b4 100644 --- a/build_tools/prepare_macos_wheel.sh +++ b/build_tools/prepare_macos_wheel.sh @@ -3,9 +3,9 @@ set -exuo pipefail if [[ "${ARCHFLAGS:-}" == *arm64 ]]; then - CONDA_CHANNEL="conda-forge/osx-arm64" + export CONDA_SUBDIR="osx-arm64" else - CONDA_CHANNEL="conda-forge/osx-64" + export CONDA_SUBDIR="osx-64" fi -/Users/runner/micromamba-bin/micromamba create -y -p $CONDA/envs/build -c $CONDA_CHANNEL jemalloc-local xsimd llvm-openmp +/Users/runner/micromamba-bin/micromamba create -y -p $CONDA/envs/build -c conda-forge jemalloc-local xsimd llvm-openmp