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

Jump to bottom

Prepare for joint migration with abseil & protobuf #309

Merged
merged 2 commits into from
Aug 11, 2023
Merged

Prepare for joint migration with abseil & protobuf #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5a6ada
use libabseil & libprotobuf that are linked in migrator
h-vetinari Aug 11, 2023
d20e3aa
MNT: Re-rendered with conda-build 3.26.0, conda-smithy 3.24.1, and co…
h-vetinari Aug 11, 2023
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_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libabseil:
- '20230125'
- '20230802'
libprotobuf:
- 4.23.3
- 4.23.4
openssl:
- '3'
pin_run_as_build:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_aarch64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libabseil:
- '20230125'
- '20230802'
libprotobuf:
- 4.23.3
- 4.23.4
openssl:
- '3'
pin_run_as_build:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_ppc64le_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libabseil:
- '20230125'
- '20230802'
libprotobuf:
- 4.23.3
- 4.23.4
openssl:
- '3'
pin_run_as_build:
Expand Down
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 @@ -17,9 +17,9 @@ cxx_compiler:
cxx_compiler_version:
- '15'
libabseil:
- '20230125'
- '20230802'
libprotobuf:
- 4.23.3
- 4.23.4
macos_machine:
- x86_64-apple-darwin13.4.0
openssl:
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 @@ -15,9 +15,9 @@ cxx_compiler:
cxx_compiler_version:
- '15'
libabseil:
- '20230125'
- '20230802'
libprotobuf:
- 4.23.3
- 4.23.4
macos_machine:
- arm64-apple-darwin20.0.0
openssl:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/win_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ channel_targets:
cxx_compiler:
- vs2019
libabseil:
- '20230125'
- '20230802'
libprotobuf:
- 4.23.3
- 4.23.4
openssl:
- '3'
pin_run_as_build:
Expand Down
5 changes: 4 additions & 1 deletion recipe/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,8 @@ MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64]
MACOSX_SDK_VERSION: # [osx and x86_64]
- "10.13" # [osx and x86_64]

# manual pins because we're linking migrations
libabseil:
- 20230802
libprotobuf:
- 4.23.3
- 4.23.4
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 @@ -41,7 +41,7 @@ source:
- patches/0013-don-t-use-find_dependency-for-protobuf.patch

build:
number: 0
number: 1

outputs:
- name: libgrpc
Expand Down