From b22466a0b2d3d45a66df5ada9dd36711883b0507 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 18 Mar 2023 00:23:53 +0000 Subject: [PATCH 01/21] updated v16.0.0 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9debb05..b8254c4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "15.0.7" %} +{% set version = "16.0.0" %} {% set prod_ver = '.'.join(version.split('.')[:3]) %} package: @@ -7,7 +7,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: 8b5fcb24b4128cf04df1b0b9410ce8b1a729cb3c544e6da885d234280dedeac6 + sha256: 9a56d906a2c81f16f06efc493a646d497c53c2f4f28f0cb1f3c8da7f74350254 patches: - patches/0001-no-code-sign.patch - patches/0002-compiler-rt-Make-7.0.0-compatible-with-10.9-SDK.patch From 11abc03daacb1faed513c1609339f137992d2e91 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 18 Mar 2023 00:24:15 +0000 Subject: [PATCH 02/21] MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.23.0, and conda-forge-pinning 2023.03.18.00.14.38 --- .azure-pipelines/azure-pipelines-win.yml | 4 ++-- .scripts/build_steps.sh | 4 ++-- .scripts/run_osx_build.sh | 4 ++-- README.md | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index a192c0b..8a96a72 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -5,7 +5,7 @@ jobs: - job: win pool: - vmImage: windows-2019 + vmImage: windows-2022 strategy: matrix: win_64_: @@ -36,7 +36,7 @@ jobs: - script: | call activate base - mamba.exe install "python=3.9" conda-build conda pip boa conda-forge-ci-setup=3 "py-lief<0.12" -c conda-forge --strict-channel-priority --yes + mamba.exe install "python=3.10" conda-build conda pip boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 71a4242..595f8b5 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -33,9 +33,9 @@ CONDARC mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index caa788e..f169576 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -24,9 +24,9 @@ source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 diff --git a/README.md b/README.md index 35d98a5..cf5a72a 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -About compiler-rt -================= +About compiler-rt-feedstock +=========================== + +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/compiler-rt-feedstock/blob/main/LICENSE.txt) Home: http://llvm.org/ Package license: Apache-2.0 WITH LLVM-exception -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/compiler-rt-feedstock/blob/main/LICENSE.txt) - Summary: compiler-rt runtime libraries Development: https://github.com/llvm/llvm-project From 8cf161cf6d4c70d8cd6adade50f838fa3a3c7605 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 18 Mar 2023 11:44:00 +1100 Subject: [PATCH 03/21] remove rc-channels --- recipe/conda_build_config.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index b9f42bd..3894159 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -4,8 +4,3 @@ c_compiler: # [osx] - clang_bootstrap # [osx] cxx_compiler: # [osx] - clang_bootstrap # [osx] - -channel_sources: - - conda-forge/label/llvm_rc,conda-forge -channel_targets: - - conda-forge llvm_rc From f789bad74cb223334d2aa498130af3fa5384cc25 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 18 Mar 2023 11:44:49 +1100 Subject: [PATCH 04/21] MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.23.0, and conda-forge-pinning 2023.03.18.00.14.38 --- .azure-pipelines/azure-pipelines-win.yml | 2 +- .ci_support/linux_64_.yaml | 4 ++-- .ci_support/linux_aarch64_.yaml | 4 ++-- .ci_support/linux_ppc64le_.yaml | 4 ++-- .ci_support/osx_64_.yaml | 4 ++-- .ci_support/osx_arm64_.yaml | 4 ++-- .ci_support/win_64_.yaml | 4 ++-- .scripts/build_steps.sh | 4 ++-- .scripts/run_osx_build.sh | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 8a96a72..07fa8d8 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -36,7 +36,7 @@ jobs: - script: | call activate base - mamba.exe install "python=3.10" conda-build conda pip boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes + mamba.exe install "python=3.10" conda-build conda pip boa conda-forge-ci-setup=3 "py-lief<0.12" -c conda-forge --strict-channel-priority --yes displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index b30588e..cd667f6 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -1,9 +1,9 @@ cdt_name: - cos6 channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cxx_compiler: - gxx cxx_compiler_version: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 3103780..c788f93 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -5,9 +5,9 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cxx_compiler: - gxx cxx_compiler_version: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index f0fdb31..79f8f7a 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -1,9 +1,9 @@ cdt_name: - cos7 channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cxx_compiler: - gxx cxx_compiler_version: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index fc4805d..984431a 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -3,9 +3,9 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '11.0' channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cxx_compiler: - clang_bootstrap cxx_compiler_version: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 007f2ab..95a93fc 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -3,9 +3,9 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '11.0' channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cxx_compiler: - clang_bootstrap cxx_compiler_version: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index e33174d..2511058 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -1,7 +1,7 @@ channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge channel_targets: -- conda-forge llvm_rc +- conda-forge main cxx_compiler: - vs2019 libxml2: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 595f8b5..71a4242 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -33,9 +33,9 @@ CONDARC mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index f169576..caa788e 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -24,9 +24,9 @@ source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" From 3aadaa61c70de2311dad8ba14657d10fb38a9365 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 29 Mar 2023 13:48:32 +1100 Subject: [PATCH 05/21] retrigger CI From 93100cc0ab41c15bc4567e1aba9ef21822355317 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 5 Apr 2023 12:41:54 +0000 Subject: [PATCH 06/21] updated v16.0.1 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 61d3c29..d722f37 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "16.0.0" %} +{% set version = "16.0.1" %} {% set prod_ver = '.'.join(version.split('.')[:3]) %} package: @@ -7,7 +7,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: 9a56d906a2c81f16f06efc493a646d497c53c2f4f28f0cb1f3c8da7f74350254 + sha256: ab7e3b95adb88fd5b669ca8c1d3c1e8d2a601c4478290d3ae31d8d70e96f2064 patches: - patches/0001-no-code-sign.patch - patches/0002-compiler-rt-Make-7.0.0-compatible-with-10.9-SDK.patch From 253256b6ad2449eb6810b679e30a37a38baa0d3f Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 23 Apr 2023 07:14:14 +1100 Subject: [PATCH 07/21] bump to 16.0.2 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d722f37..fbec259 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "16.0.1" %} +{% set version = "16.0.2" %} {% set prod_ver = '.'.join(version.split('.')[:3]) %} package: @@ -7,7 +7,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: ab7e3b95adb88fd5b669ca8c1d3c1e8d2a601c4478290d3ae31d8d70e96f2064 + sha256: 6d8acae041ccd34abe144cda6eaa76210e1491f286574815b7261b3f2e58734c patches: - patches/0001-no-code-sign.patch - patches/0002-compiler-rt-Make-7.0.0-compatible-with-10.9-SDK.patch From 3d0d6c6cbc952413954731c4b2e83ffc1a0b46af Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 23 Apr 2023 07:16:17 +1100 Subject: [PATCH 08/21] MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.04.21.18.24.51 --- .ci_support/linux_64_.yaml | 2 +- .ci_support/linux_aarch64_.yaml | 2 +- .ci_support/linux_ppc64le_.yaml | 2 +- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index cd667f6..1b3f962 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libxml2: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index c788f93..c3769d9 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-aarch64 libxml2: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 79f8f7a..6d5d6ad 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-ppc64le libxml2: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 984431a..bd0bbfb 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -9,7 +9,7 @@ channel_targets: cxx_compiler: - clang_bootstrap cxx_compiler_version: -- '14' +- '15' libxml2: - '2.10' macos_machine: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 95a93fc..a7a5ee3 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -9,7 +9,7 @@ channel_targets: cxx_compiler: - clang_bootstrap cxx_compiler_version: -- '14' +- '15' libxml2: - '2.10' macos_machine: From 427a4cdf529ce4c6fba963f875bc33d30e46ed85 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 3 May 2023 06:51:19 +0000 Subject: [PATCH 09/21] updated v16.0.3 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index fbec259..d009371 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "16.0.2" %} +{% set version = "16.0.3" %} {% set prod_ver = '.'.join(version.split('.')[:3]) %} package: @@ -7,7 +7,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: 6d8acae041ccd34abe144cda6eaa76210e1491f286574815b7261b3f2e58734c + sha256: 3b12e35332e10cf650578ae18247b91b04926d5427e1a6ae9a51d170a47cfbb2 patches: - patches/0001-no-code-sign.patch - patches/0002-compiler-rt-Make-7.0.0-compatible-with-10.9-SDK.patch From 8a265904db6ba5d7d9faa09dfee02f3de52077d2 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 17 May 2023 20:08:37 +1100 Subject: [PATCH 10/21] [ci skip] add abi_migration_branches --- conda-forge.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conda-forge.yml b/conda-forge.yml index 6e77409..07db3cf 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,3 +1,7 @@ +bot: + abi_migration_branches: + - 15.x + - 14.x provider: linux_ppc64le: default linux_aarch64: default From 806dc57590657af4534fabab09d503fa55bec6b7 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 18 May 2023 03:57:24 +0000 Subject: [PATCH 11/21] Rebuild for libxml2211 --- .ci_support/migrations/libxml2211.yaml | 7 +++++++ conda-forge.yml | 21 +++++++++++---------- recipe/meta.yaml | 2 +- 3 files changed, 19 insertions(+), 11 deletions(-) create mode 100644 .ci_support/migrations/libxml2211.yaml diff --git a/.ci_support/migrations/libxml2211.yaml b/.ci_support/migrations/libxml2211.yaml new file mode 100644 index 0000000..9bce314 --- /dev/null +++ b/.ci_support/migrations/libxml2211.yaml @@ -0,0 +1,7 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 +libxml2: +- '2.11' +migrator_ts: 1684203491.9767957 diff --git a/conda-forge.yml b/conda-forge.yml index 07db3cf..72c81b2 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -2,19 +2,20 @@ bot: abi_migration_branches: - 15.x - 14.x -provider: - linux_ppc64le: default - linux_aarch64: default -conda_forge_output_validation: true -channel_priority: flexible build_platform: + linux_aarch64: linux_64 + linux_ppc64le: linux_64 osx_arm64: osx_64 +channel_priority: flexible +conda_build: + pkg_format: '2' +conda_forge_output_validation: true github: branch_name: main tooling_branch_name: main -conda_build: - pkg_format: '2' -# due to https://github.com/conda/conda-build/issues/4787 +provider: + linux_aarch64: default + linux_ppc64le: default remote_ci_setup: - - conda-forge-ci-setup=3 - - py-lief<0.12 +- conda-forge-ci-setup=3 +- py-lief<0.12 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d009371..383495a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -13,7 +13,7 @@ source: - patches/0002-compiler-rt-Make-7.0.0-compatible-with-10.9-SDK.patch build: - number: 0 + number: 1 requirements: build: From 1f92231d59367e3d01de20fc19d52e33ce42c5c2 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 18 May 2023 03:57:43 +0000 Subject: [PATCH 12/21] MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.05.17.15.05.36 --- .azure-pipelines/azure-pipelines-linux.yml | 8 +++++++ .ci_support/linux_64_.yaml | 2 +- .ci_support/linux_aarch64_.yaml | 4 ++-- .ci_support/linux_ppc64le_.yaml | 4 ++-- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .ci_support/win_64_.yaml | 2 +- .travis.yml | 27 ---------------------- README.md | 9 +------- 9 files changed, 17 insertions(+), 43 deletions(-) delete mode 100644 .travis.yml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 974e878..3b9dee7 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -12,6 +12,14 @@ jobs: CONFIG: linux_64_ UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_: + CONFIG: linux_aarch64_ + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_: + CONFIG: linux_ppc64le_ + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 steps: diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 1b3f962..675e991 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -11,7 +11,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libxml2: -- '2.10' +- '2.11' target_platform: - linux-64 zlib: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index c3769d9..56bd5c3 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -13,9 +13,9 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 libxml2: -- '2.10' +- '2.11' target_platform: - linux-aarch64 zlib: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 6d5d6ad..f4eca13 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -9,9 +9,9 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 libxml2: -- '2.10' +- '2.11' target_platform: - linux-ppc64le zlib: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index bd0bbfb..3442f88 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -11,7 +11,7 @@ cxx_compiler: cxx_compiler_version: - '15' libxml2: -- '2.10' +- '2.11' macos_machine: - x86_64-apple-darwin13.4.0 target_platform: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index a7a5ee3..39925cb 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -11,7 +11,7 @@ cxx_compiler: cxx_compiler_version: - '15' libxml2: -- '2.10' +- '2.11' macos_machine: - arm64-apple-darwin20.0.0 target_platform: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 2511058..2a623aa 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -5,7 +5,7 @@ channel_targets: cxx_compiler: - vs2019 libxml2: -- '2.10' +- '2.11' target_platform: - win-64 zlib: diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 58a72eb..0000000 --- a/.travis.yml +++ /dev/null @@ -1,27 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. - -language: generic - - - -matrix: - include: - - env: CONFIG=linux_aarch64_ UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 - os: linux - arch: arm64 - dist: focal - - - env: CONFIG=linux_ppc64le_ UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - -script: - - export CI=travis - - export GIT_BRANCH="$TRAVIS_BRANCH" - - export FEEDSTOCK_NAME=$(basename ${TRAVIS_REPO_SLUG}) - - if [[ "${TRAVIS_PULL_REQUEST:-}" == "false" ]]; then export IS_PR_BUILD="False"; else export IS_PR_BUILD="True"; fi - - - - if [[ ${PLATFORM} =~ .*linux.* ]]; then CONDA_FORGE_DOCKER_RUN_ARGS="--network=host --security-opt=seccomp=unconfined" ./.scripts/run_docker_build.sh; fi \ No newline at end of file diff --git a/README.md b/README.md index cf5a72a..60f1546 100644 --- a/README.md +++ b/README.md @@ -24,14 +24,7 @@ Current build status ==================== - - - - +
Travis - - linux - -
From 1ba7ef701f09f0726b5769f2e714714c249e66ef Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 18 May 2023 19:31:05 +1100 Subject: [PATCH 13/21] don't cross-compile aarch64/ppc64le --- conda-forge.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/conda-forge.yml b/conda-forge.yml index 72c81b2..1c6b0f2 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -3,8 +3,6 @@ bot: - 15.x - 14.x build_platform: - linux_aarch64: linux_64 - linux_ppc64le: linux_64 osx_arm64: osx_64 channel_priority: flexible conda_build: From 8ab62b22d804042b0639c53531fbfe7ee498e59b Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 19 May 2023 08:26:49 +1100 Subject: [PATCH 14/21] MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.05.17.15.05.36 --- .azure-pipelines/azure-pipelines-linux.yml | 8 ------- .ci_support/linux_aarch64_.yaml | 2 +- .ci_support/linux_ppc64le_.yaml | 2 +- .travis.yml | 27 ++++++++++++++++++++++ README.md | 9 +++++++- 5 files changed, 37 insertions(+), 11 deletions(-) create mode 100644 .travis.yml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 3b9dee7..974e878 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -12,14 +12,6 @@ jobs: CONFIG: linux_64_ UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_: - CONFIG: linux_aarch64_ - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_: - CONFIG: linux_ppc64le_ - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 steps: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 56bd5c3..24e034f 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-aarch64 libxml2: - '2.11' target_platform: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index f4eca13..d0a6913 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -9,7 +9,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-ppc64le libxml2: - '2.11' target_platform: diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..58a72eb --- /dev/null +++ b/.travis.yml @@ -0,0 +1,27 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. + +language: generic + + + +matrix: + include: + - env: CONFIG=linux_aarch64_ UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + os: linux + arch: arm64 + dist: focal + + - env: CONFIG=linux_ppc64le_ UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + +script: + - export CI=travis + - export GIT_BRANCH="$TRAVIS_BRANCH" + - export FEEDSTOCK_NAME=$(basename ${TRAVIS_REPO_SLUG}) + - if [[ "${TRAVIS_PULL_REQUEST:-}" == "false" ]]; then export IS_PR_BUILD="False"; else export IS_PR_BUILD="True"; fi + + + - if [[ ${PLATFORM} =~ .*linux.* ]]; then CONDA_FORGE_DOCKER_RUN_ARGS="--network=host --security-opt=seccomp=unconfined" ./.scripts/run_docker_build.sh; fi \ No newline at end of file diff --git a/README.md b/README.md index 60f1546..cf5a72a 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,14 @@ Current build status ==================== -
Azure
+
+ + + From f1adb6951d51d1afd64f581f1ef9be126b6ed6b5 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 17 May 2023 08:00:49 +0000 Subject: [PATCH 15/21] updated v16.0.4 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 383495a..9ce3f5e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "16.0.3" %} +{% set version = "16.0.4" %} {% set prod_ver = '.'.join(version.split('.')[:3]) %} package: @@ -7,13 +7,13 @@ 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: 3b12e35332e10cf650578ae18247b91b04926d5427e1a6ae9a51d170a47cfbb2 + sha256: cf3c2a1152ed7a99866bd7f12c24528ada6d9f6336afb7a08416938762004c9f patches: - patches/0001-no-code-sign.patch - patches/0002-compiler-rt-Make-7.0.0-compatible-with-10.9-SDK.patch build: - number: 1 + number: 0 requirements: build: From ca9115a238bc663c4b922c40c31048082d259ac8 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 2 Jun 2023 16:12:34 +0000 Subject: [PATCH 16/21] updated v16.0.5 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9ce3f5e..5b4c031 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "16.0.4" %} +{% set version = "16.0.5" %} {% set prod_ver = '.'.join(version.split('.')[:3]) %} package: @@ -7,7 +7,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: cf3c2a1152ed7a99866bd7f12c24528ada6d9f6336afb7a08416938762004c9f + sha256: 37f540124b9cfd4680666e649f557077f9937c9178489cea285a672e714b2863 patches: - patches/0001-no-code-sign.patch - patches/0002-compiler-rt-Make-7.0.0-compatible-with-10.9-SDK.patch From 13979ae6919ecb6a8d1bf6fdd936090c731fbd73 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 14 Jun 2023 06:38:21 +0000 Subject: [PATCH 17/21] updated v16.0.6 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5b4c031..a2643ba 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "16.0.5" %} +{% set version = "16.0.6" %} {% set prod_ver = '.'.join(version.split('.')[:3]) %} package: @@ -7,7 +7,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: 37f540124b9cfd4680666e649f557077f9937c9178489cea285a672e714b2863 + sha256: ce5e71081d17ce9e86d7cbcfa28c4b04b9300f8fb7e78422b1feb6bc52c3028e patches: - patches/0001-no-code-sign.patch - patches/0002-compiler-rt-Make-7.0.0-compatible-with-10.9-SDK.patch From a00568198a69dd7045c1334901da99c517268c66 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 21 Jul 2023 13:11:58 +0200 Subject: [PATCH 18/21] Revert "remove rc-channels" This reverts commit 95a104e0e561cca35d8817f8316718482fd4bb83. --- recipe/conda_build_config.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 3894159..b9f42bd 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -4,3 +4,8 @@ c_compiler: # [osx] - clang_bootstrap # [osx] cxx_compiler: # [osx] - clang_bootstrap # [osx] + +channel_sources: + - conda-forge/label/llvm_rc,conda-forge +channel_targets: + - conda-forge llvm_rc From 293b14a12948e01d6b5902530a427c3833d16784 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 21 Jul 2023 13:13:25 +0200 Subject: [PATCH 19/21] MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.24.0, and conda-forge-pinning 2023.07.19.16.49.37 --- .azure-pipelines/azure-pipelines-win.yml | 2 +- .ci_support/linux_64_.yaml | 4 ++-- .ci_support/linux_aarch64_.yaml | 4 ++-- .ci_support/linux_ppc64le_.yaml | 4 ++-- .ci_support/osx_64_.yaml | 4 ++-- .ci_support/osx_arm64_.yaml | 4 ++-- .ci_support/win_64_.yaml | 4 ++-- .scripts/run_osx_build.sh | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 07fa8d8..a4053b0 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -60,7 +60,7 @@ jobs: if EXIST LICENSE.txt ( copy LICENSE.txt "recipe\\recipe-scripts-license.txt" ) - conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables + 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/linux_64_.yaml b/.ci_support/linux_64_.yaml index 675e991..b922d45 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -1,9 +1,9 @@ cdt_name: - cos6 channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - gxx cxx_compiler_version: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 24e034f..0f048e3 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -5,9 +5,9 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - gxx cxx_compiler_version: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index d0a6913..3f94c07 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -1,9 +1,9 @@ cdt_name: - cos7 channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - gxx cxx_compiler_version: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 3442f88..31ece92 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -3,9 +3,9 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '11.0' channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - clang_bootstrap cxx_compiler_version: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 39925cb..4d97110 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -3,9 +3,9 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '11.0' channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - clang_bootstrap cxx_compiler_version: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 2a623aa..51bc4b2 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -1,7 +1,7 @@ channel_sources: -- conda-forge +- conda-forge/label/llvm_rc,conda-forge channel_targets: -- conda-forge main +- conda-forge llvm_rc cxx_compiler: - vs2019 libxml2: diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index caa788e..2b45a12 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -55,7 +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 [[ -f LICENSE.txt ]]; then cp LICENSE.txt "recipe/recipe-scripts-license.txt" fi @@ -71,6 +70,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else + conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml From 4be1917566b28b2aedc76332b992dd6127fb3268 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 21 Jul 2023 13:17:21 +0200 Subject: [PATCH 20/21] build from upstream main branch --- recipe/meta.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a2643ba..e49db10 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "16.0.6" %} +{% set version = "17.0.0.dev0" %} {% set prod_ver = '.'.join(version.split('.')[:3]) %} package: @@ -6,8 +6,10 @@ package: version: {{ version }} 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 + git_url: https://github.com/llvm/llvm-project.git + git_rev: a4f4d82c35b80b681687b545200456e79a82d9c2 + # 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 patches: - patches/0001-no-code-sign.patch - patches/0002-compiler-rt-Make-7.0.0-compatible-with-10.9-SDK.patch From 864271b589560f249a7c8aa93d72220cfb974d56 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 24 Jul 2023 13:23:36 +0200 Subject: [PATCH 21/21] fix prod_ver vs. dev0 --- recipe/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e49db10..ac2e2af 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,6 @@ {% set version = "17.0.0.dev0" %} -{% set prod_ver = '.'.join(version.split('.')[:3]) %} +# suffixes .rc1, .rc2, etc. are removed (on unix), while .dev0 is not. +{% set prod_ver = '.'.join(version.split('.')[:3]) if version.split(".")[-1] != "dev0" else version %} package: name: compiler-rt-packages
Travis + + linux + +
Azure