Skip to content

Commit

Permalink
Merge pull request #100 from traversaro/updaterebuild
Browse files Browse the repository at this point in the history
Bump version to 7.3.1 and temporary rebuild for libprotobuf 5.28.2 and 5.28.3
  • Loading branch information
Tobias-Fischer authored Jan 15, 2025
2 parents ab6e031 + f30717d commit e159afe
Show file tree
Hide file tree
Showing 19 changed files with 296 additions and 35 deletions.
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.

7 changes: 5 additions & 2 deletions .azure-pipelines/azure-pipelines-win.yml

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

35 changes: 35 additions & 0 deletions .ci_support/linux_64_libprotobuf5.28.2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
c_compiler:
- gcc
c_compiler_version:
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- conda
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma9
jsoncpp:
- 1.9.6
libcurl:
- '8'
libprotobuf:
- 5.28.2
libzip:
- '1'
target_platform:
- linux-64
tinyxml2:
- '10'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
File renamed without changes.
35 changes: 35 additions & 0 deletions .ci_support/linux_aarch64_libprotobuf5.28.2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
c_compiler:
- gcc
c_compiler_version:
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- conda
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma9
jsoncpp:
- 1.9.6
libcurl:
- '8'
libprotobuf:
- 5.28.2
libzip:
- '1'
target_platform:
- linux-aarch64
tinyxml2:
- '10'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
File renamed without changes.
35 changes: 35 additions & 0 deletions .ci_support/linux_ppc64le_libprotobuf5.28.2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
c_compiler:
- gcc
c_compiler_version:
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- conda
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-x86_64:alma9
jsoncpp:
- 1.9.6
libcurl:
- '8'
libprotobuf:
- 5.28.2
libzip:
- '1'
target_platform:
- linux-ppc64le
tinyxml2:
- '10'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
File renamed without changes.
8 changes: 0 additions & 8 deletions .ci_support/migrations/libprotobuf5283.yaml

This file was deleted.

37 changes: 37 additions & 0 deletions .ci_support/osx_64_libprotobuf5.28.2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
c_compiler:
- clang
c_compiler_version:
- '18'
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:
- '18'
jsoncpp:
- 1.9.6
libcurl:
- '8'
libprotobuf:
- 5.28.2
libzip:
- '1'
macos_machine:
- x86_64-apple-darwin13.4.0
target_platform:
- osx-64
tinyxml2:
- '10'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
File renamed without changes.
37 changes: 37 additions & 0 deletions .ci_support/osx_arm64_libprotobuf5.28.2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
c_compiler:
- clang
c_compiler_version:
- '18'
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:
- '18'
jsoncpp:
- 1.9.6
libcurl:
- '8'
libprotobuf:
- 5.28.2
libzip:
- '1'
macos_machine:
- arm64-apple-darwin20.0.0
target_platform:
- osx-arm64
tinyxml2:
- '10'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
File renamed without changes.
24 changes: 24 additions & 0 deletions .ci_support/win_64_libprotobuf5.28.2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
c_compiler:
- vs2019
c_stdlib:
- vs
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- vs2019
jsoncpp:
- 1.9.6
libcurl:
- '8'
libprotobuf:
- 5.28.2
libzip:
- '1'
target_platform:
- win-64
tinyxml2:
- '10'
zlib:
- '1'
File renamed without changes.
66 changes: 54 additions & 12 deletions README.md

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

3 changes: 3 additions & 0 deletions recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
libprotobuf:
- 5.28.2
- 5.28.3
Loading

0 comments on commit e159afe

Please sign in to comment.