diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 6894cd14..a59d6834 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -23,11 +23,6 @@ jobs: timeoutInMinutes: 360 steps: - - script: | - rm -rf /opt/ghc - df -h - displayName: Manage disk space - # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 8a96a72e..d66c7d15 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -60,7 +60,10 @@ jobs: if EXIST LICENSE.txt ( copy LICENSE.txt "recipe\\recipe-scripts-license.txt" ) - conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables + if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + ) + conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% displayName: Build recipe env: PYTHONUNBUFFERED: 1 diff --git a/.ci_support/migrations/libxml2211.yaml b/.ci_support/migrations/libxml2211.yaml deleted file mode 100644 index 9bce3143..00000000 --- a/.ci_support/migrations/libxml2211.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -libxml2: -- '2.11' -migrator_ts: 1684203491.9767957 diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index bb00584b..3969edf3 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -55,11 +55,6 @@ source run_conda_forge_build_setup echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml -if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then - EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" -fi - - if [[ -f LICENSE.txt ]]; then cp LICENSE.txt "recipe/recipe-scripts-license.txt" fi @@ -75,6 +70,11 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else + + if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" + fi + conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml diff --git a/README.md b/README.md index aa25898b..856de467 100644 --- a/README.md +++ b/README.md @@ -84,15 +84,15 @@ Current release info | Name | Downloads | Version | Platforms | | --- | --- | --- | --- | | [![Conda Recipe](https://img.shields.io/badge/recipe-clang-green.svg)](https://anaconda.org/conda-forge/clang) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clang.svg)](https://anaconda.org/conda-forge/clang) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clang.svg)](https://anaconda.org/conda-forge/clang) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clang.svg)](https://anaconda.org/conda-forge/clang) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-clang--16-green.svg)](https://anaconda.org/conda-forge/clang-16) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clang-16.svg)](https://anaconda.org/conda-forge/clang-16) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clang-16.svg)](https://anaconda.org/conda-forge/clang-16) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clang-16.svg)](https://anaconda.org/conda-forge/clang-16) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-clang--17-green.svg)](https://anaconda.org/conda-forge/clang-17) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clang-17.svg)](https://anaconda.org/conda-forge/clang-17) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clang-17.svg)](https://anaconda.org/conda-forge/clang-17) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clang-17.svg)](https://anaconda.org/conda-forge/clang-17) | | [![Conda Recipe](https://img.shields.io/badge/recipe-clang--format-green.svg)](https://anaconda.org/conda-forge/clang-format) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clang-format.svg)](https://anaconda.org/conda-forge/clang-format) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clang-format.svg)](https://anaconda.org/conda-forge/clang-format) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clang-format.svg)](https://anaconda.org/conda-forge/clang-format) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-clang--format--16-green.svg)](https://anaconda.org/conda-forge/clang-format-16) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clang-format-16.svg)](https://anaconda.org/conda-forge/clang-format-16) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clang-format-16.svg)](https://anaconda.org/conda-forge/clang-format-16) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clang-format-16.svg)](https://anaconda.org/conda-forge/clang-format-16) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-clang--format--17-green.svg)](https://anaconda.org/conda-forge/clang-format-17) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clang-format-17.svg)](https://anaconda.org/conda-forge/clang-format-17) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clang-format-17.svg)](https://anaconda.org/conda-forge/clang-format-17) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clang-format-17.svg)](https://anaconda.org/conda-forge/clang-format-17) | | [![Conda Recipe](https://img.shields.io/badge/recipe-clang--tools-green.svg)](https://anaconda.org/conda-forge/clang-tools) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clang-tools.svg)](https://anaconda.org/conda-forge/clang-tools) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clang-tools.svg)](https://anaconda.org/conda-forge/clang-tools) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clang-tools.svg)](https://anaconda.org/conda-forge/clang-tools) | | [![Conda Recipe](https://img.shields.io/badge/recipe-clangdev-green.svg)](https://anaconda.org/conda-forge/clangdev) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clangdev.svg)](https://anaconda.org/conda-forge/clangdev) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clangdev.svg)](https://anaconda.org/conda-forge/clangdev) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clangdev.svg)](https://anaconda.org/conda-forge/clangdev) | | [![Conda Recipe](https://img.shields.io/badge/recipe-clangxx-green.svg)](https://anaconda.org/conda-forge/clangxx) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/clangxx.svg)](https://anaconda.org/conda-forge/clangxx) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/clangxx.svg)](https://anaconda.org/conda-forge/clangxx) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/clangxx.svg)](https://anaconda.org/conda-forge/clangxx) | | [![Conda Recipe](https://img.shields.io/badge/recipe-libclang-green.svg)](https://anaconda.org/conda-forge/libclang) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libclang.svg)](https://anaconda.org/conda-forge/libclang) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libclang.svg)](https://anaconda.org/conda-forge/libclang) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libclang.svg)](https://anaconda.org/conda-forge/libclang) | | [![Conda Recipe](https://img.shields.io/badge/recipe-libclang--cpp-green.svg)](https://anaconda.org/conda-forge/libclang-cpp) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libclang-cpp.svg)](https://anaconda.org/conda-forge/libclang-cpp) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libclang-cpp.svg)](https://anaconda.org/conda-forge/libclang-cpp) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libclang-cpp.svg)](https://anaconda.org/conda-forge/libclang-cpp) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-libclang--cpp16-green.svg)](https://anaconda.org/conda-forge/libclang-cpp16) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libclang-cpp16.svg)](https://anaconda.org/conda-forge/libclang-cpp16) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libclang-cpp16.svg)](https://anaconda.org/conda-forge/libclang-cpp16) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libclang-cpp16.svg)](https://anaconda.org/conda-forge/libclang-cpp16) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-libclang--cpp17-green.svg)](https://anaconda.org/conda-forge/libclang-cpp17) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libclang-cpp17.svg)](https://anaconda.org/conda-forge/libclang-cpp17) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libclang-cpp17.svg)](https://anaconda.org/conda-forge/libclang-cpp17) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libclang-cpp17.svg)](https://anaconda.org/conda-forge/libclang-cpp17) | | [![Conda Recipe](https://img.shields.io/badge/recipe-libclang13-green.svg)](https://anaconda.org/conda-forge/libclang13) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libclang13.svg)](https://anaconda.org/conda-forge/libclang13) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libclang13.svg)](https://anaconda.org/conda-forge/libclang13) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libclang13.svg)](https://anaconda.org/conda-forge/libclang13) | | [![Conda Recipe](https://img.shields.io/badge/recipe-python--clang-green.svg)](https://anaconda.org/conda-forge/python-clang) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/python-clang.svg)](https://anaconda.org/conda-forge/python-clang) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/python-clang.svg)](https://anaconda.org/conda-forge/python-clang) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/python-clang.svg)](https://anaconda.org/conda-forge/python-clang) | @@ -106,16 +106,16 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `clang, clang-16, clang-format, clang-format-16, clang-tools, clangdev, clangxx, libclang, libclang-cpp, libclang-cpp16, libclang13, python-clang` can be installed with `conda`: +Once the `conda-forge` channel has been enabled, `clang, clang-17, clang-format, clang-format-17, clang-tools, clangdev, clangxx, libclang, libclang-cpp, libclang-cpp17, libclang13, python-clang` can be installed with `conda`: ``` -conda install clang clang-16 clang-format clang-format-16 clang-tools clangdev clangxx libclang libclang-cpp libclang-cpp16 libclang13 python-clang +conda install clang clang-17 clang-format clang-format-17 clang-tools clangdev clangxx libclang libclang-cpp libclang-cpp17 libclang13 python-clang ``` or with `mamba`: ``` -mamba install clang clang-16 clang-format clang-format-16 clang-tools clangdev clangxx libclang libclang-cpp libclang-cpp16 libclang13 python-clang +mamba install clang clang-17 clang-format clang-format-17 clang-tools clangdev clangxx libclang libclang-cpp libclang-cpp17 libclang13 python-clang ``` It is possible to list all of the versions of `clang` available on your platform with `conda`: diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c98218bf..bb4d6815 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ -{% set version = "16.0.6" %} +{% set version = "17.0.1" %} {% set major_version = version.split(".")[0] %} -{% set build_number = 1 %} +{% set build_number = 0 %} {% set minor_aware_ext = major_version %} {% if version.split(".")[1] | int > 0 %} @@ -17,7 +17,7 @@ package: source: - url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz - sha256: ce5e71081d17ce9e86d7cbcfa28c4b04b9300f8fb7e78422b1feb6bc52c3028e + sha256: b0e42aafc01ece2ca2b42e3526f54bebc4b1f1dc8de6e34f46a0446a13e882b9 patches: - patches/0001-Fix-sysroot-detection-for-linux.patch - patches/0002-clang-add-conda-specific-env-var-CONDA_BUILD_SYSROOT.patch