Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[12.x] Rebuild for grpc 1.60 & protobuf 4.25.1 #1294

Merged
merged 4 commits into from
Jan 30, 2024
Merged

[12.x] Rebuild for grpc 1.60 & protobuf 4.25.1 #1294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
809a570
bump migration number to pick up newest cuda120.yaml from global pinning
h-vetinari Jan 29, 2024
a0d07a0
manually add grpc/protobuf migration
h-vetinari Jan 30, 2024
59b6af0
MNT: Re-rendered with conda-build 3.28.4, conda-smithy 3.30.4, and co…
h-vetinari Jan 30, 2024
6e14b6f
bump build number
h-vetinari Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .ci_support/linux_64_cuda_compiler_version11.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ google_cloud_cpp:
libabseil:
- '20230802'
libgrpc:
- '1.59'
- '1.60'
libprotobuf:
- 4.24.4
- 4.25.1
lz4_c:
- 1.9.3
numpy:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_64_cuda_compiler_versionNone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ google_cloud_cpp:
libabseil:
- '20230802'
libgrpc:
- '1.59'
- '1.60'
libprotobuf:
- 4.24.4
- 4.25.1
lz4_c:
- 1.9.3
numpy:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_aarch64_cuda_compiler_version11.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ google_cloud_cpp:
libabseil:
- '20230802'
libgrpc:
- '1.59'
- '1.60'
libprotobuf:
- 4.24.4
- 4.25.1
lz4_c:
- 1.9.3
numpy:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_aarch64_cuda_compiler_versionNone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ google_cloud_cpp:
libabseil:
- '20230802'
libgrpc:
- '1.59'
- '1.60'
libprotobuf:
- 4.24.4
- 4.25.1
lz4_c:
- 1.9.3
numpy:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_ppc64le_cuda_compiler_version11.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ google_cloud_cpp:
libabseil:
- '20230802'
libgrpc:
- '1.59'
- '1.60'
libprotobuf:
- 4.24.4
- 4.25.1
lz4_c:
- 1.9.3
numpy:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_ppc64le_cuda_compiler_versionNone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ google_cloud_cpp:
libabseil:
- '20230802'
libgrpc:
- '1.59'
- '1.60'
libprotobuf:
- 4.24.4
- 4.25.1
lz4_c:
- 1.9.3
numpy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/migrations/cuda120.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ __migrator:
kind:
version
migration_number:
1
3
build_number:
1
paused: false
Expand Down
10 changes: 10 additions & 0 deletions .ci_support/migrations/libprotobuf4251.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
__migrator:
build_number: 1
commit_message: Rebuild for libprotobuf 4.25.1
kind: version
migration_number: 1
libgrpc:
- "1.60"
libprotobuf:
- 4.25.1
migrator_ts: 1705841975.2201185
4 changes: 2 additions & 2 deletions .ci_support/osx_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ google_cloud_cpp:
libabseil:
- '20230802'
libgrpc:
- '1.59'
- '1.60'
libprotobuf:
- 4.24.4
- 4.25.1
lz4_c:
- 1.9.3
macos_machine:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_arm64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ google_cloud_cpp:
libabseil:
- '20230802'
libgrpc:
- '1.59'
- '1.60'
libprotobuf:
- 4.24.4
- 4.25.1
lz4_c:
- 1.9.3
macos_machine:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/win_64_cuda_compiler_version11.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ libcrc32c:
libcurl:
- '8'
libgrpc:
- '1.59'
- '1.60'
libprotobuf:
- 4.24.4
- 4.25.1
lz4_c:
- 1.9.3
numpy:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/win_64_cuda_compiler_versionNone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ libcrc32c:
libcurl:
- '8'
libgrpc:
- '1.59'
- '1.60'
libprotobuf:
- 4.24.4
- 4.25.1
lz4_c:
- 1.9.3
numpy:
Expand Down
13 changes: 12 additions & 1 deletion .gitignore
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions .scripts/build_steps.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .scripts/run_docker_build.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ source:
folder: testing

build:
number: 34
number: 35
# 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)]
Expand Down