From 4a2502b8e2c3143863d613a0c8e5762a9c9406d6 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 26 Sep 2024 10:18:07 +0000 Subject: [PATCH 1/2] Rebuild for libabseil 20240722, libgrp 1.65 & libprotobuf 5.27.5 --- ...abseil20240722_grpc165_libprotobuf5275.yaml | 18 ++++++++++++++++++ conda-forge.yml | 10 +++++----- recipe/meta.yaml | 2 +- 3 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 .ci_support/migrations/libabseil20240722_grpc165_libprotobuf5275.yaml diff --git a/.ci_support/migrations/libabseil20240722_grpc165_libprotobuf5275.yaml b/.ci_support/migrations/libabseil20240722_grpc165_libprotobuf5275.yaml new file mode 100644 index 0000000..85540a1 --- /dev/null +++ b/.ci_support/migrations/libabseil20240722_grpc165_libprotobuf5275.yaml @@ -0,0 +1,18 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for libabseil 20240722, libgrp 1.65 & libprotobuf 5.27.5 + kind: version + migration_number: 1 + exclude: + - abseil-cpp + - grpc-cpp + - libprotobuf + - protobuf + - re2 +libabseil: +- 20240722 +libgrpc: +- "1.65" +libprotobuf: +- 5.27.5 +migrator_ts: 1727040240.8650293 diff --git a/conda-forge.yml b/conda-forge.yml index a6c98ac..f59a6aa 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,10 +1,10 @@ azure: free_disk_space: true + settings_linux: + swapfile_size: 10GiB settings_win: variables: CONDA_BLD_PATH: C:\\bld\\ - settings_linux: - swapfile_size: 10GiB bot: automerge: true build_platform: @@ -18,7 +18,7 @@ github: branch_name: main tooling_branch_name: main remote_ci_setup: - - conda-forge-ci-setup=4 - - python=3.11 - - py-lief=0.12.3 +- conda-forge-ci-setup=4 +- python=3.11 +- py-lief=0.12.3 test: native_and_emulated diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1b0f29f..d280de1 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,7 +9,7 @@ source: sha256: 758e1eca8186b962516c0659b34ce1768ba1c9769cfd998c5bbffb084ad901ff build: - number: 0 + number: 1 requirements: build: - {{ compiler('c') }} From bed0547423b13cace05e43a805b5b95cdee7e156 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 26 Sep 2024 10:20:50 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.40.1, and conda-forge-pinning 2024.09.26.07.35.45 --- .ci_support/linux_64_.yaml | 38 ++++++++++++++++----------------- .ci_support/linux_aarch64_.yaml | 38 ++++++++++++++++----------------- .ci_support/linux_ppc64le_.yaml | 38 ++++++++++++++++----------------- .ci_support/osx_64_.yaml | 38 ++++++++++++++++----------------- .ci_support/osx_arm64_.yaml | 38 ++++++++++++++++----------------- .ci_support/win_64_.yaml | 38 ++++++++++++++++----------------- .scripts/build_steps.sh | 2 ++ .scripts/run_win_build.bat | 2 +- build-locally.py | 2 +- 9 files changed, 118 insertions(+), 116 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 3d97090..3389c45 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -19,45 +19,45 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libabseil: -- '20240116' +- '20240722' libcurl: - '8' libgoogle_cloud_aiplatform_devel: -- '2.28' +- '2.29' libgoogle_cloud_automl_devel: -- '2.28' +- '2.29' libgoogle_cloud_bigquery_devel: -- '2.28' +- '2.29' libgoogle_cloud_bigtable_devel: -- '2.28' +- '2.29' libgoogle_cloud_compute_devel: -- '2.28' +- '2.29' libgoogle_cloud_dialogflow_cx_devel: -- '2.28' +- '2.29' libgoogle_cloud_dialogflow_es_devel: -- '2.28' +- '2.29' libgoogle_cloud_discoveryengine_devel: -- '2.28' +- '2.29' libgoogle_cloud_dlp_devel: -- '2.28' +- '2.29' libgoogle_cloud_iam_devel: -- '2.28' +- '2.29' libgoogle_cloud_oauth2_devel: -- '2.28' +- '2.29' libgoogle_cloud_policytroubleshooter_devel: -- '2.28' +- '2.29' libgoogle_cloud_pubsub_devel: -- '2.28' +- '2.29' libgoogle_cloud_spanner_devel: -- '2.28' +- '2.29' libgoogle_cloud_speech_devel: -- '2.28' +- '2.29' libgoogle_cloud_storage_devel: -- '2.28' +- '2.29' libgrpc: -- '1.62' +- '1.65' libprotobuf: -- 4.25.3 +- 5.27.5 openssl: - '3' target_platform: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 6cc0f06..3432ff0 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -23,45 +23,45 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libabseil: -- '20240116' +- '20240722' libcurl: - '8' libgoogle_cloud_aiplatform_devel: -- '2.28' +- '2.29' libgoogle_cloud_automl_devel: -- '2.28' +- '2.29' libgoogle_cloud_bigquery_devel: -- '2.28' +- '2.29' libgoogle_cloud_bigtable_devel: -- '2.28' +- '2.29' libgoogle_cloud_compute_devel: -- '2.28' +- '2.29' libgoogle_cloud_dialogflow_cx_devel: -- '2.28' +- '2.29' libgoogle_cloud_dialogflow_es_devel: -- '2.28' +- '2.29' libgoogle_cloud_discoveryengine_devel: -- '2.28' +- '2.29' libgoogle_cloud_dlp_devel: -- '2.28' +- '2.29' libgoogle_cloud_iam_devel: -- '2.28' +- '2.29' libgoogle_cloud_oauth2_devel: -- '2.28' +- '2.29' libgoogle_cloud_policytroubleshooter_devel: -- '2.28' +- '2.29' libgoogle_cloud_pubsub_devel: -- '2.28' +- '2.29' libgoogle_cloud_spanner_devel: -- '2.28' +- '2.29' libgoogle_cloud_speech_devel: -- '2.28' +- '2.29' libgoogle_cloud_storage_devel: -- '2.28' +- '2.29' libgrpc: -- '1.62' +- '1.65' libprotobuf: -- 4.25.3 +- 5.27.5 openssl: - '3' target_platform: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index fda9419..73ca100 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -19,45 +19,45 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libabseil: -- '20240116' +- '20240722' libcurl: - '8' libgoogle_cloud_aiplatform_devel: -- '2.28' +- '2.29' libgoogle_cloud_automl_devel: -- '2.28' +- '2.29' libgoogle_cloud_bigquery_devel: -- '2.28' +- '2.29' libgoogle_cloud_bigtable_devel: -- '2.28' +- '2.29' libgoogle_cloud_compute_devel: -- '2.28' +- '2.29' libgoogle_cloud_dialogflow_cx_devel: -- '2.28' +- '2.29' libgoogle_cloud_dialogflow_es_devel: -- '2.28' +- '2.29' libgoogle_cloud_discoveryengine_devel: -- '2.28' +- '2.29' libgoogle_cloud_dlp_devel: -- '2.28' +- '2.29' libgoogle_cloud_iam_devel: -- '2.28' +- '2.29' libgoogle_cloud_oauth2_devel: -- '2.28' +- '2.29' libgoogle_cloud_policytroubleshooter_devel: -- '2.28' +- '2.29' libgoogle_cloud_pubsub_devel: -- '2.28' +- '2.29' libgoogle_cloud_spanner_devel: -- '2.28' +- '2.29' libgoogle_cloud_speech_devel: -- '2.28' +- '2.29' libgoogle_cloud_storage_devel: -- '2.28' +- '2.29' libgrpc: -- '1.62' +- '1.65' libprotobuf: -- 4.25.3 +- 5.27.5 openssl: - '3' target_platform: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index e7888df..8946715 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -19,45 +19,45 @@ cxx_compiler: cxx_compiler_version: - '17' libabseil: -- '20240116' +- '20240722' libcurl: - '8' libgoogle_cloud_aiplatform_devel: -- '2.28' +- '2.29' libgoogle_cloud_automl_devel: -- '2.28' +- '2.29' libgoogle_cloud_bigquery_devel: -- '2.28' +- '2.29' libgoogle_cloud_bigtable_devel: -- '2.28' +- '2.29' libgoogle_cloud_compute_devel: -- '2.28' +- '2.29' libgoogle_cloud_dialogflow_cx_devel: -- '2.28' +- '2.29' libgoogle_cloud_dialogflow_es_devel: -- '2.28' +- '2.29' libgoogle_cloud_discoveryengine_devel: -- '2.28' +- '2.29' libgoogle_cloud_dlp_devel: -- '2.28' +- '2.29' libgoogle_cloud_iam_devel: -- '2.28' +- '2.29' libgoogle_cloud_oauth2_devel: -- '2.28' +- '2.29' libgoogle_cloud_policytroubleshooter_devel: -- '2.28' +- '2.29' libgoogle_cloud_pubsub_devel: -- '2.28' +- '2.29' libgoogle_cloud_spanner_devel: -- '2.28' +- '2.29' libgoogle_cloud_speech_devel: -- '2.28' +- '2.29' libgoogle_cloud_storage_devel: -- '2.28' +- '2.29' libgrpc: -- '1.62' +- '1.65' libprotobuf: -- 4.25.3 +- 5.27.5 macos_machine: - x86_64-apple-darwin13.4.0 openssl: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index b55c9db..65e0d4f 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -19,45 +19,45 @@ cxx_compiler: cxx_compiler_version: - '17' libabseil: -- '20240116' +- '20240722' libcurl: - '8' libgoogle_cloud_aiplatform_devel: -- '2.28' +- '2.29' libgoogle_cloud_automl_devel: -- '2.28' +- '2.29' libgoogle_cloud_bigquery_devel: -- '2.28' +- '2.29' libgoogle_cloud_bigtable_devel: -- '2.28' +- '2.29' libgoogle_cloud_compute_devel: -- '2.28' +- '2.29' libgoogle_cloud_dialogflow_cx_devel: -- '2.28' +- '2.29' libgoogle_cloud_dialogflow_es_devel: -- '2.28' +- '2.29' libgoogle_cloud_discoveryengine_devel: -- '2.28' +- '2.29' libgoogle_cloud_dlp_devel: -- '2.28' +- '2.29' libgoogle_cloud_iam_devel: -- '2.28' +- '2.29' libgoogle_cloud_oauth2_devel: -- '2.28' +- '2.29' libgoogle_cloud_policytroubleshooter_devel: -- '2.28' +- '2.29' libgoogle_cloud_pubsub_devel: -- '2.28' +- '2.29' libgoogle_cloud_spanner_devel: -- '2.28' +- '2.29' libgoogle_cloud_speech_devel: -- '2.28' +- '2.29' libgoogle_cloud_storage_devel: -- '2.28' +- '2.29' libgrpc: -- '1.62' +- '1.65' libprotobuf: -- 4.25.3 +- 5.27.5 macos_machine: - arm64-apple-darwin20.0.0 openssl: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index cb1d72a..14471cd 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -9,45 +9,45 @@ channel_targets: cxx_compiler: - vs2019 libabseil: -- '20240116' +- '20240722' libcurl: - '8' libgoogle_cloud_aiplatform_devel: -- '2.28' +- '2.29' libgoogle_cloud_automl_devel: -- '2.28' +- '2.29' libgoogle_cloud_bigquery_devel: -- '2.28' +- '2.29' libgoogle_cloud_bigtable_devel: -- '2.28' +- '2.29' libgoogle_cloud_compute_devel: -- '2.28' +- '2.29' libgoogle_cloud_dialogflow_cx_devel: -- '2.28' +- '2.29' libgoogle_cloud_dialogflow_es_devel: -- '2.28' +- '2.29' libgoogle_cloud_discoveryengine_devel: -- '2.28' +- '2.29' libgoogle_cloud_dlp_devel: -- '2.28' +- '2.29' libgoogle_cloud_iam_devel: -- '2.28' +- '2.29' libgoogle_cloud_oauth2_devel: -- '2.28' +- '2.29' libgoogle_cloud_policytroubleshooter_devel: -- '2.28' +- '2.29' libgoogle_cloud_pubsub_devel: -- '2.28' +- '2.29' libgoogle_cloud_spanner_devel: -- '2.28' +- '2.29' libgoogle_cloud_speech_devel: -- '2.28' +- '2.29' libgoogle_cloud_storage_devel: -- '2.28' +- '2.29' libgrpc: -- '1.62' +- '1.65' libprotobuf: -- 4.25.3 +- 5.27.5 openssl: - '3' target_platform: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index e9a5f15..615a187 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -43,6 +43,8 @@ setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" source run_conda_forge_build_setup + + # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index e6326e1..f8e00bb 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -48,7 +48,7 @@ if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( ) if NOT [%flow_run_id%] == [] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" ) call :end_group diff --git a/build-locally.py b/build-locally.py index 8ac9b84..6788aea 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,5 +1,5 @@ #!/bin/sh -"""exec' "python3" "$0" "$@" #""" # fmt: off # fmt: on +"""exec" "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally.