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

[v6] Rebuild for libabseil 20240722, libgrp 1.65 & libprotobuf 5.27.5 #40

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
1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-linux.yml

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

3 changes: 2 additions & 1 deletion .azure-pipelines/azure-pipelines-osx.yml

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

2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-win.yml

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

16 changes: 11 additions & 5 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,25 +1,29 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
elfutils:
- '0.191'
libabseil:
- '20240116'
- '20240722'
libprotobuf:
- 4.25.3
- 5.27.5
qt_main:
- '5.15'
target_platform:
Expand All @@ -29,3 +33,5 @@ tinyxml2:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
14 changes: 10 additions & 4 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ BUILD:
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -15,15 +19,15 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
elfutils:
- '0.191'
libabseil:
- '20240116'
- '20240722'
libprotobuf:
- 4.25.3
- 5.27.5
qt_main:
- '5.15'
target_platform:
Expand All @@ -33,3 +37,5 @@ tinyxml2:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
8 changes: 0 additions & 8 deletions .ci_support/migrations/elfutils0191.yaml

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
__migrator:
build_number: 1
commit_message: Rebuild for libabseil 20240722, libgrp 1.65 & libprotobuf 5.27.5
kind: version
migration_number: 1
exclude:
- abseil-cpp
- grpc-cpp
- libprotobuf
- protobuf
- re2
libabseil:
- 20240722
libgrpc:
- "1.65"
libprotobuf:
- 5.27.5
migrator_ts: 1727040240.8650293
51 changes: 0 additions & 51 deletions .ci_support/migrations/libgoogle_cloud222.yaml

This file was deleted.

23 changes: 0 additions & 23 deletions .ci_support/migrations/libgrpc162_libprotobuf4253.yaml

This file was deleted.

14 changes: 10 additions & 4 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,21 +1,27 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
c_compiler:
- clang
c_compiler_version:
- '16'
- '17'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.13'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
- '17'
libabseil:
- '20240116'
- '20240722'
libprotobuf:
- 4.25.3
- 5.27.5
macos_machine:
- x86_64-apple-darwin13.4.0
qt_main:
Expand Down
14 changes: 10 additions & 4 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
@@ -1,21 +1,27 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
c_compiler:
- clang
c_compiler_version:
- '16'
- '17'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
- '17'
libabseil:
- '20240116'
- '20240722'
libprotobuf:
- 4.25.3
- 5.27.5
macos_machine:
- arm64-apple-darwin20.0.0
qt_main:
Expand Down
6 changes: 4 additions & 2 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
c_compiler:
- vs2019
c_stdlib:
- vs
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- vs2019
libabseil:
- '20240116'
- '20240722'
libprotobuf:
- 4.25.3
- 5.27.5
qt_main:
- '5.15'
target_platform:
Expand Down
4 changes: 2 additions & 2 deletions .gitattributes

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

10 changes: 9 additions & 1 deletion .scripts/build_steps.sh

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

11 changes: 9 additions & 2 deletions .scripts/run_osx_build.sh

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

Loading
Loading