From a5b25909fe53977d8dc7365e53d1210d4b18f5d7 Mon Sep 17 00:00:00 2001 From: Daniel Ching Date: Wed, 20 Nov 2024 10:55:48 -0600 Subject: [PATCH] CI: Use os_version: alma8 instead of docker_image: alma:8 [ci skip] ***NO_CI*** --- .ci_support/linux_aarch64_.yaml | 4 +--- .scripts/build_steps.sh | 14 +++++++------- build-locally.py | 7 +++++++ conda-forge.yml | 2 ++ recipe/conda_build_config.yaml | 2 -- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 85fcb04..0f5bf91 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -13,7 +13,7 @@ c_stdlib_version: cdt_arch: - aarch64 cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -29,5 +29,3 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 856f469..827a29f 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,13 +31,13 @@ pkgs_dirs: solver: libmamba CONDARC +mv /opt/conda/conda-meta/history /opt/conda/conda-meta/history.$(date +%Y-%m-%d-%H-%M-%S) +echo > /opt/conda/conda-meta/history +micromamba install --root-prefix ~/.conda --prefix /opt/conda \ + --yes --override-channels --channel conda-forge --strict-channel-priority \ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 -mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" - # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -76,8 +76,8 @@ else --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Inspecting artifacts" ) 2> /dev/null - # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 - command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir "${RECIPE_ROOT}" -m "${CONFIG_FILE}" || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null diff --git a/build-locally.py b/build-locally.py index 6788aea..c4a56c6 100755 --- a/build-locally.py +++ b/build-locally.py @@ -26,6 +26,13 @@ def setup_environment(ns): os.path.dirname(__file__), "miniforge3" ) + # The default cache location might not be writable using docker on macOS. + if ns.config.startswith("linux") and platform.system() == "Darwin": + os.environ["CONDA_FORGE_DOCKER_RUN_ARGS"] = ( + os.environ.get("CONDA_FORGE_DOCKER_RUN_ARGS", "") + + " -e RATTLER_CACHE_DIR=/tmp/rattler_cache" + ) + def run_docker_build(ns): script = ".scripts/run_docker_build.sh" diff --git a/conda-forge.yml b/conda-forge.yml index 84a03e9..3eba927 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -9,3 +9,5 @@ github: conda_build: error_overlinking: true conda_forge_output_validation: true +os_version: + linux_aarch64: alma8 diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 72f9b28..8e7f4b6 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -2,5 +2,3 @@ c_stdlib_version: # [linux] - 2.28 # [linux] arm_variant_type: # [aarch64] - sbsa # [aarch64] -docker_image: # Use image with support of glibc 2.28 - - quay.io/condaforge/linux-anvil-alma-aarch64:8 # [linux and aarch64]