Skip to content

Commit

Permalink
Merge pull request #1044 from h-vetinari/google_11
Browse files Browse the repository at this point in the history
[11.0.x] Rebuild for libgoogle_cloud2100
h-vetinari authored May 4, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents 6d49c0b + 452948c commit 035062e
Showing 15 changed files with 34 additions and 32 deletions.
3 changes: 2 additions & 1 deletion .ci_support/linux_64_cuda_compiler_version10.2.yaml
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ gflags:
glog:
- '0.6'
google_cloud_cpp:
- 2.9.1
- 2.10.0
libabseil:
- '20230125'
libevent:
@@ -75,6 +75,7 @@ ucx:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
5 changes: 3 additions & 2 deletions .ci_support/linux_64_cuda_compiler_versionNone.yaml
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ channel_sources:
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
- None
cuda_compiler_version:
- None
cuda_compiler_version_min:
@@ -33,7 +33,7 @@ gflags:
glog:
- '0.6'
google_cloud_cpp:
- 2.9.1
- 2.10.0
libabseil:
- '20230125'
libevent:
@@ -75,6 +75,7 @@ ucx:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
3 changes: 2 additions & 1 deletion .ci_support/linux_aarch64_cuda_compiler_version11.2.yaml
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ gflags:
glog:
- '0.6'
google_cloud_cpp:
- 2.9.1
- 2.10.0
libabseil:
- '20230125'
libevent:
@@ -79,6 +79,7 @@ ucx:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
5 changes: 3 additions & 2 deletions .ci_support/linux_aarch64_cuda_compiler_versionNone.yaml
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ channel_sources:
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
- None
cuda_compiler_version:
- None
cuda_compiler_version_min:
@@ -37,7 +37,7 @@ gflags:
glog:
- '0.6'
google_cloud_cpp:
- 2.9.1
- 2.10.0
libabseil:
- '20230125'
libevent:
@@ -79,6 +79,7 @@ ucx:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
3 changes: 2 additions & 1 deletion .ci_support/linux_ppc64le_cuda_compiler_version11.2.yaml
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ gflags:
glog:
- '0.6'
google_cloud_cpp:
- 2.9.1
- 2.10.0
libabseil:
- '20230125'
libevent:
@@ -75,6 +75,7 @@ ucx:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
5 changes: 3 additions & 2 deletions .ci_support/linux_ppc64le_cuda_compiler_versionNone.yaml
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ channel_sources:
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
- None
cuda_compiler_version:
- None
cuda_compiler_version_min:
@@ -33,7 +33,7 @@ gflags:
glog:
- '0.6'
google_cloud_cpp:
- 2.9.1
- 2.10.0
libabseil:
- '20230125'
libevent:
@@ -75,6 +75,7 @@ ucx:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
8 changes: 0 additions & 8 deletions .ci_support/migrations/aws_sdk_cpp19375.yaml

This file was deleted.

1 change: 0 additions & 1 deletion .ci_support/migrations/cuda_112_ppc64le_aarch64.yaml
Original file line number Diff line number Diff line change
@@ -15,7 +15,6 @@ __migrator:
wait_for_migrators:
- aarch64 and ppc64le addition
exclude_pinned_pkgs: False
use_local: true
commit_message: "Rebuild for cuda for ppc64le and aarch64"

arm_variant_type: # [aarch64]
9 changes: 9 additions & 0 deletions .ci_support/migrations/libgoogle_cloud2100.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
__migrator:
build_number: 1
kind: version
migration_number: 1
libgoogle_cloud:
- 2.10.0
google_cloud_cpp:
- 2.10.0
migrator_ts: 1683064486.2253776
8 changes: 0 additions & 8 deletions .ci_support/migrations/ucx1410.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ gflags:
glog:
- '0.6'
google_cloud_cpp:
- 2.9.1
- 2.10.0
libabseil:
- '20230125'
libevent:
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ gflags:
glog:
- '0.6'
google_cloud_cpp:
- 2.9.1
- 2.10.0
libabseil:
- '20230125'
libevent:
4 changes: 3 additions & 1 deletion .ci_support/win_64_cuda_compiler_version10.2.yaml
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ gflags:
glog:
- '0.6'
google_cloud_cpp:
- 2.9.1
- 2.10.0
libabseil:
- '20230125'
libcrc32c:
@@ -65,6 +65,8 @@ target_platform:
thrift_cpp:
- 0.18.1
zip_keys:
- - cuda_compiler
- cuda_compiler_version
- - python
- numpy
zlib:
6 changes: 4 additions & 2 deletions .ci_support/win_64_cuda_compiler_versionNone.yaml
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ channel_sources:
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
- None
cuda_compiler_version:
- None
cuda_compiler_version_min:
@@ -23,7 +23,7 @@ gflags:
glog:
- '0.6'
google_cloud_cpp:
- 2.9.1
- 2.10.0
libabseil:
- '20230125'
libcrc32c:
@@ -65,6 +65,8 @@ target_platform:
thrift_cpp:
- 0.18.1
zip_keys:
- - cuda_compiler
- cuda_compiler_version
- - python
- numpy
zlib:
2 changes: 1 addition & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ source:
folder: testing

build:
number: 18
number: 19
# for cuda support, building with one version is enough to be compatible with
# all later versions, since arrow is only using libcuda, and not libcudart.
skip: true # [cuda_compiler_version not in ("None", cuda_compiler_version_min)]

0 comments on commit 035062e

Please sign in to comment.