From d7a4364146d2e493214645e1b481ccc0f503d4d9 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 4 Nov 2024 07:16:55 +0000 Subject: [PATCH 1/2] Rebuild for libgrpc 1.67 & libprotobuf 5.28.2 --- .ci_support/migrations/libgrpc167_libprotobuf5282.yaml | 10 ++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libgrpc167_libprotobuf5282.yaml diff --git a/.ci_support/migrations/libgrpc167_libprotobuf5282.yaml b/.ci_support/migrations/libgrpc167_libprotobuf5282.yaml new file mode 100644 index 00000000..67f50fd9 --- /dev/null +++ b/.ci_support/migrations/libgrpc167_libprotobuf5282.yaml @@ -0,0 +1,10 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for libgrpc 1.67 & libprotobuf 5.28.2 + kind: version + migration_number: 1 +libgrpc: +- "1.67" +libprotobuf: +- 5.28.2 +migrator_ts: 1729238463 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1d2a831c..75333569 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -21,7 +21,7 @@ build: skip: true # [osx and py<39] # not ready yet; needs to unpin pybind11 skip: true # [py>=312] - number: 0 + number: 1 entry_points: - arcticdb_update_storage = arcticdb.scripts.update_storage:main From 344f2da85b178b9e08bef31a2bfdf57a5923486c Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 4 Nov 2024 07:17:38 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.43.2, and conda-forge-pinning 2024.11.04.06.40.41 --- .ci_support/linux_64_numpy1.22python3.10.____cpython.yaml | 2 +- .ci_support/linux_64_numpy1.22python3.9.____cpython.yaml | 2 +- .ci_support/linux_64_numpy1.23python3.11.____cpython.yaml | 2 +- .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml | 6 +++--- .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml | 6 +++--- .ci_support/osx_64_numpy1.23python3.11.____cpython.yaml | 6 +++--- .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml | 6 +++--- .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml | 6 +++--- .ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml | 6 +++--- azure-pipelines.yml | 2 +- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml index bfdc006e..6ea090b1 100644 --- a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml @@ -41,7 +41,7 @@ libcurl: libevent: - 2.1.12 libprotobuf: -- 5.27.5 +- 5.28.2 lmdb: - 0.9.22 lz4_c: diff --git a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml index d50b6b33..1abcd24c 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml @@ -41,7 +41,7 @@ libcurl: libevent: - 2.1.12 libprotobuf: -- 5.27.5 +- 5.28.2 lmdb: - 0.9.22 lz4_c: diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml index da32e1d0..f7f79cec 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml @@ -41,7 +41,7 @@ libcurl: libevent: - 2.1.12 libprotobuf: -- 5.27.5 +- 5.28.2 lmdb: - 0.9.22 lz4_c: diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index 015fe88d..215c6a47 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -13,7 +13,7 @@ azure_storage_blobs_cpp: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -25,7 +25,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' fmt: - '11' folly: @@ -41,7 +41,7 @@ libcurl: libevent: - 2.1.12 libprotobuf: -- 5.27.5 +- 5.28.2 lmdb: - 0.9.22 lz4_c: diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index cfc97bec..cfc11f59 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -13,7 +13,7 @@ azure_storage_blobs_cpp: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -25,7 +25,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' fmt: - '11' folly: @@ -41,7 +41,7 @@ libcurl: libevent: - 2.1.12 libprotobuf: -- 5.27.5 +- 5.28.2 lmdb: - 0.9.22 lz4_c: diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index bbc6c2ca..2b83cfc2 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -13,7 +13,7 @@ azure_storage_blobs_cpp: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -25,7 +25,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' fmt: - '11' folly: @@ -41,7 +41,7 @@ libcurl: libevent: - 2.1.12 libprotobuf: -- 5.27.5 +- 5.28.2 lmdb: - 0.9.22 lz4_c: diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index 2416e394..98aa6519 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -13,7 +13,7 @@ azure_storage_blobs_cpp: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -25,7 +25,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' fmt: - '11' folly: @@ -41,7 +41,7 @@ libcurl: libevent: - 2.1.12 libprotobuf: -- 5.27.5 +- 5.28.2 lmdb: - 0.9.22 lz4_c: diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index c356010a..ca20edb8 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -13,7 +13,7 @@ azure_storage_blobs_cpp: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -25,7 +25,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' fmt: - '11' folly: @@ -41,7 +41,7 @@ libcurl: libevent: - 2.1.12 libprotobuf: -- 5.27.5 +- 5.28.2 lmdb: - 0.9.22 lz4_c: diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index 728f328e..d52dad2c 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -13,7 +13,7 @@ azure_storage_blobs_cpp: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -25,7 +25,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' fmt: - '11' folly: @@ -41,7 +41,7 @@ libcurl: libevent: - 2.1.12 libprotobuf: -- 5.27.5 +- 5.28.2 lmdb: - 0.9.22 lz4_c: diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 67d82fab..013bdc11 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -19,7 +19,7 @@ stages: echo "##vso[task.setvariable variable=log]$git_log" displayName: Obtain commit message - bash: echo "##vso[task.setvariable variable=RET]false" - condition: or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]')) + condition: and(eq(variables['Build.Reason'], 'PullRequest'), or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]'))) displayName: Skip build? - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET" name: result