diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index bb3b6f6..8f90658 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -12,10 +12,12 @@ jobs: CONFIG: osx_64_python3.10.____cpython UPLOAD_PACKAGES: 'True' VMIMAGE: macOS-15 + store_build_artifacts: false osx_arm64_python3.10.____cpython: CONFIG: osx_arm64_python3.10.____cpython UPLOAD_PACKAGES: 'True' VMIMAGE: macOS-15 + store_build_artifacts: false timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index c74c0fd..b265312 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -11,6 +11,7 @@ jobs: win_64_python3.10.____cpython: CONFIG: win_64_python3.10.____cpython UPLOAD_PACKAGES: 'True' + store_build_artifacts: false timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index b148b2a..dc62f9c 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -23,11 +23,13 @@ jobs: matrix: include: - CONFIG: linux_64_python3.10.____cpython + STORE_BUILD_ARTIFACTS: False UPLOAD_PACKAGES: True os: ubuntu runs_on: ['ubuntu-latest'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONFIG: linux_aarch64_python3.10.____cpython + STORE_BUILD_ARTIFACTS: False UPLOAD_PACKAGES: True os: ubuntu runs_on: ['ubuntu-latest'] @@ -104,7 +106,7 @@ jobs: env: # default value; make it explicit, as it needs to match with artefact # generation below. Not configurable for now, can be revisited later - CONDA_BLD_DIR: C:\bld + CONDA_BLD_PATH: C:\bld MINIFORGE_HOME: ${{ contains(runner.arch, 'ARM') && 'C' || 'D' }}:\Miniforge PYTHONUNBUFFERED: 1 CONFIG: ${{ matrix.CONFIG }} diff --git a/.gitignore b/.gitignore index 47b5408..86a9c55 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ # Ignore all files and folders in root * !/conda-forge.yml +!.recipe_maintainers.json # Don't ignore any files/folders if the parent folder is 'un-ignored' # This also avoids warnings when adding an already-checked file with an ignored parent. diff --git a/recipe/build.sh b/recipe/build.sh index 1fe7e48..23119e7 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -4,11 +4,15 @@ set -o xtrace -o nounset -o pipefail -o errexit export CARGO_PROFILE_RELEASE_STRIP=symbols export CARGO_PROFILE_RELEASE_LTO=fat -export RUSTFLAGS="${RUSTFLAGS:-} --cfg auditable" + +# Remove this wrapper once https://github.com/conda-forge/rust-activation-feedstock/pull/79 is merged +mkdir -p "${BUILD_PREFIX}/bin" +cp "${RECIPE_DIR}/cargo-auditable-wrapper.sh" "${BUILD_PREFIX}/bin/cargo-auditable-wrapper" +export CARGO="cargo-auditable-wrapper" # Bundle licenses cargo-bundle-licenses --format yaml --output ${SRC_DIR}/THIRDPARTY.yml # Build python -m pip install . \ - --no-deps --ignore-installed -vv --no-build-isolation --disable-pip-version-check + --no-deps --ignore-installed -vv --no-build-isolation --disable-pip-version-check diff --git a/recipe/cargo-auditable-wrapper.sh b/recipe/cargo-auditable-wrapper.sh new file mode 100755 index 0000000..c393fb7 --- /dev/null +++ b/recipe/cargo-auditable-wrapper.sh @@ -0,0 +1,2 @@ +#!/bin/sh +exec cargo auditable $* diff --git a/recipe/recipe.yaml b/recipe/recipe.yaml index 4fcb20e..c64211e 100644 --- a/recipe/recipe.yaml +++ b/recipe/recipe.yaml @@ -12,7 +12,7 @@ source: sha256: 450dc40f9c7d442e5493db45ece18861c0609ff12b0df4ac32c05b47f543978c build: - number: 1 + number: 2 skip: not (match(python, python_min) and is_abi3) python: version_independent: true