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 protobuf423 [ign-msg5] #86

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: 18 additions & 6 deletions .azure-pipelines/azure-pipelines-linux.yml

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

14 changes: 10 additions & 4 deletions .azure-pipelines/azure-pipelines-osx.yml

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

15 changes: 11 additions & 4 deletions .azure-pipelines/azure-pipelines-win.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,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '10'
- '12'
cdt_name:
- cos6
channel_sources:
Expand All @@ -11,7 +11,7 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '10'
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libprotobuf:
Expand Down
25 changes: 25 additions & 0 deletions .ci_support/linux_64_libprotobuf4.23.2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
cdt_name:
- cos6
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libprotobuf:
- 4.23.2
target_platform:
- linux-64
tinyxml2:
- '9'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BUILD:
c_compiler:
- gcc
c_compiler_version:
- '10'
- '12'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -15,7 +15,7 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '10'
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libprotobuf:
Expand Down
29 changes: 29 additions & 0 deletions .ci_support/linux_aarch64_libprotobuf4.23.2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
c_compiler:
- gcc
c_compiler_version:
- '12'
cdt_arch:
- aarch64
cdt_name:
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libprotobuf:
- 4.23.2
target_platform:
- linux-aarch64
tinyxml2:
- '9'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '10'
- '12'
cdt_name:
- cos7
channel_sources:
Expand All @@ -11,7 +11,7 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '10'
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libprotobuf:
Expand Down
25 changes: 25 additions & 0 deletions .ci_support/linux_ppc64le_libprotobuf4.23.2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
cdt_name:
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libprotobuf:
- 4.23.2
target_platform:
- linux-ppc64le
tinyxml2:
- '9'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
7 changes: 0 additions & 7 deletions .ci_support/migrations/libprotobuf321.yaml

This file was deleted.

11 changes: 11 additions & 0 deletions .ci_support/migrations/protobuf423.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
__migrator:
build_number: 1
kind: version
migration_number: 2
libgrpc:
- '1.54'
- '1.55'
libprotobuf:
- '3.21'
- '4.23.2'
migrator_ts: 1684932016.2362208
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '14'
- '15'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '14'
- '15'
libprotobuf:
- '3.21'
macos_machine:
Expand Down
25 changes: 25 additions & 0 deletions .ci_support/osx_64_libprotobuf4.23.2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
c_compiler:
- clang
c_compiler_version:
- '15'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '15'
libprotobuf:
- 4.23.2
macos_machine:
- x86_64-apple-darwin13.4.0
target_platform:
- osx-64
tinyxml2:
- '9'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '14'
- '15'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '14'
- '15'
libprotobuf:
- '3.21'
macos_machine:
Expand Down
25 changes: 25 additions & 0 deletions .ci_support/osx_arm64_libprotobuf4.23.2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
c_compiler:
- clang
c_compiler_version:
- '15'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '15'
libprotobuf:
- 4.23.2
macos_machine:
- arm64-apple-darwin20.0.0
target_platform:
- osx-arm64
tinyxml2:
- '9'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
File renamed without changes.
14 changes: 14 additions & 0 deletions .ci_support/win_64_libprotobuf4.23.2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
c_compiler:
- vs2019
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- vs2019
libprotobuf:
- 4.23.2
target_platform:
- win-64
tinyxml2:
- '9'
2 changes: 1 addition & 1 deletion .circleci/config.yml

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

2 changes: 1 addition & 1 deletion .github/workflows/webservices.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
steps:
- name: webservices
id: webservices
uses: conda-forge/webservices-dispatch-action@master
uses: conda-forge/webservices-dispatch-action@main
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }}
1 change: 0 additions & 1 deletion .scripts/run_osx_build.sh

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

Loading