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.

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

Rebuild for abseil_cpp20220623 (redux) #138

Merged
merged 4 commits into from
Aug 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 12 additions & 12 deletions .azure-pipelines/azure-pipelines-linux.yml

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

18 changes: 9 additions & 9 deletions .azure-pipelines/azure-pipelines-osx.yml

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

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
abseil_cpp:
- '20210324.2'
- '20220623.0'
c_compiler:
- gcc
c_compiler_version:
Expand All @@ -17,7 +17,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
grpc_cpp:
- '1.45'
- '1.46'
libprotobuf:
- '3.20'
target_platform:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
abseil_cpp:
- '20210324.2'
- '20220623.0'
c_compiler:
- gcc
c_compiler_version:
Expand All @@ -21,7 +21,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
grpc_cpp:
- '1.45'
- '1.46'
libprotobuf:
- '3.20'
target_platform:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
abseil_cpp:
- '20210324.2'
- '20220623.0'
c_compiler:
- gcc
c_compiler_version:
Expand All @@ -17,7 +17,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
grpc_cpp:
- '1.45'
- '1.46'
libprotobuf:
- '3.20'
target_platform:
Expand Down
20 changes: 20 additions & 0 deletions .ci_support/migrations/abseil_cpp202206230.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
__migrator:
build_number: 1
kind: version
migration_number: 2

# TODO: Make sure to remove the associated zip keys in the final file
# when the migration is complete
abseil_cpp:
- '20220623.0'
# new name, use both for now
libabseil:
- '20220623.0'
# separate output for static builds (depending on C++ version)
# also need to be migrated
libabseil_static:
- '20220623.0'
grpc_cpp:
- '1.46'

migrator_ts: 1656693919.0942996
7 changes: 0 additions & 7 deletions .ci_support/migrations/libprotobuf320.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ abseil_cpp:
c_compiler:
- clang
c_compiler_version:
- '13'
- '14'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '13'
- '14'
grpc_cpp:
- '1.46'
libprotobuf:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.12'
abseil_cpp:
- '20210324.2'
- '20220623.0'
c_compiler:
- clang
c_compiler_version:
- '13'
- '14'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '13'
- '14'
grpc_cpp:
- '1.45'
- '1.46'
libprotobuf:
- '3.20'
macos_machine:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ abseil_cpp:
c_compiler:
- clang
c_compiler_version:
- '13'
- '14'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '13'
- '14'
grpc_cpp:
- '1.46'
libprotobuf:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
abseil_cpp:
- '20210324.2'
- '20220623.0'
c_compiler:
- clang
c_compiler_version:
- '13'
- '14'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '13'
- '14'
grpc_cpp:
- '1.45'
- '1.46'
libprotobuf:
- '3.20'
macos_machine:
Expand Down
2 changes: 1 addition & 1 deletion .github/CODEOWNERS

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

53 changes: 23 additions & 30 deletions README.md

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

Loading