diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index aef462c4..b1513b82 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -11,15 +11,15 @@ jobs: linux_64_: CONFIG: linux_64_ UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 linux_aarch64_: CONFIG: linux_aarch64_ UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 linux_ppc64le_: CONFIG: linux_ppc64le_ UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 6e2e0443..6fd28c93 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -19,24 +19,6 @@ jobs: UPLOAD_TEMP: D:\\tmp steps: - - - task: PythonScript@0 - displayName: 'Download Miniforge' - inputs: - scriptSource: inline - script: | - import urllib.request - url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe' - path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" - urllib.request.urlretrieve(url, path) - - - script: | - start /wait "" %BUILD_ARTIFACTSTAGINGDIRECTORY%\Miniforge.exe /InstallationType=JustMe /RegisterPython=0 /S /D=C:\Miniforge - displayName: Install Miniforge - - - powershell: Write-Host "##vso[task.prependpath]C:\Miniforge\Scripts" - displayName: Add conda to PATH - - powershell: | Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\" $InstallPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index da628611..f8158940 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 libxml2: - '2' target_platform: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 483c6690..65a426bc 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -1,11 +1,7 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_arch: -- aarch64 cdt_name: - conda channel_sources: @@ -17,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 libxml2: - '2' target_platform: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index bfdaa75a..bf66b4f9 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 libxml2: - '2' target_platform: diff --git a/build-locally.py b/build-locally.py index 6788aea6..c4a56c66 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 5cd8d768..c63c9c3c 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,5 +1,6 @@ azure: settings_win: + install_atl: true variables: CONDA_BLD_PATH: C:\\bld\\ MINIFORGE_HOME: C:\\Miniforge diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e94d7be2..7b5cdc6e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,10 +1,11 @@ -{% set version = "20.0.0.dev0" %} +{% set version = "20.0.0.dev1" %} {% set major_ver = version.split(".")[0] %} +{% set tail_ver = version.split(".")[-1] %} {% set maj_min = major_ver ~ "." ~ version.split(".")[1] %} # as of LLVM 19, we expect an "-rcX" suffix for the release candidates -{% set extra = "-" ~ version.split(".")[-1] if version.split(".")[-1] not in "0123456789" else "" %} -{% set extra = "git" if version.split(".")[-1] == "dev0" else extra %} +{% set extra = "-" ~ tail_ver if tail_ver not in "0123456789" else "" %} +{% set extra = "git" if tail_ver|trim("0123456789") == "dev" else extra %} package: name: llvm-package @@ -12,8 +13,8 @@ package: source: # url: https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-{{ version.replace(".rc", "-rc") }}.tar.gz - url: https://github.com/llvm/llvm-project/archive/87bfa58a5a4b85416d2486797d0f21fc67da5cf3.tar.gz - sha256: 6453827c61593a987f51a5eaa265f4ccfc60901821c9bbb1c6fd1ac17681f0e3 + url: https://github.com/llvm/llvm-project/archive/74449ab86b8bc8d7388ede0cc7fc3a679da0c567.tar.gz + sha256: 429b861248900cdd340963e10f9f134bb738b789f50e933d10724680312ec530 patches: # - patches/intel-D47188-svml-VF.patch # Fixes vectorizer and extends SVML support # - patches/expect-fastmath-entrypoints-in-add-TLI-mappings.ll.patch # adjusts test added in 10.0.0 for intel-D47188-svml-VF.patch effects @@ -61,14 +62,13 @@ outputs: host: - libcxx {{ cxx_compiler_version }} # [osx] - {{ pin_subpackage("libllvm" ~ major_ver, exact=True) }} - # to avoid picking up LLVM-C.{dll,lib} as part of llvmdev - {{ pin_subpackage("libllvm-c" ~ major_ver, exact=True) }} # [win] - {{ pin_subpackage("llvm-tools", exact=True) }} - zlib - zstd run: - # we're deliberately excluding "libllvm-c" on windows - {{ pin_subpackage("libllvm" ~ major_ver, exact=True) }} + - {{ pin_subpackage("libllvm-c" ~ major_ver, exact=True) }} # [win] - {{ pin_subpackage("llvm-tools", exact=True) }} # we need to do this manually because clang_bootstrap has no run-export - libcxx >={{ cxx_compiler_version }} # [osx]