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

Rebuild for protobuf423 and drop ogre1.12 builds #42

Merged
merged 9 commits into from
Jun 7, 2023
Merged

Rebuild for protobuf423 and drop ogre1.12 builds #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a46f607
Rebuild for protobuf423
regro-cf-autotick-bot Jun 6, 2023
df62362
MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.23.1, and co…
regro-cf-autotick-bot Jun 6, 2023
ad91386
Update conda_build_config.yaml
traversaro Jun 7, 2023
6b4fc75
Update conda_build_config.yaml
traversaro Jun 7, 2023
8ebd7c9
Create 351.patch
traversaro Jun 7, 2023
4dcb79c
Update meta.yaml
traversaro Jun 7, 2023
b24dc94
Update conda_build_config.yaml
traversaro Jun 7, 2023
b611f1d
Update meta.yaml
traversaro Jun 7, 2023
df4b7f2
MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.23.1, and co…
Jun 7, 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
8 changes: 4 additions & 4 deletions .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

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

16 changes: 8 additions & 8 deletions .azure-pipelines/azure-pipelines-osx.yml
View file
Open in desktop

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

16 changes: 10 additions & 6 deletions .azure-pipelines/azure-pipelines-win.yml
View file
Open in desktop

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

6 changes: 2 additions & 4 deletions .ci_support/linux_64_ogre1.10.yaml → .ci_support/linux_64_libprotobuf3.21.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '11'
- '12'
cdt_name:
- cos6
channel_sources:
Expand All @@ -11,13 +11,11 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '11'
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libprotobuf:
- '3.21'
ogre:
- '1.10'
target_platform:
- linux-64
zip_keys:
Expand Down
8 changes: 3 additions & 5 deletions .ci_support/linux_64_ogre1.12.yaml → .ci_support/linux_64_libprotobuf4.23.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '11'
- '12'
cdt_name:
- cos6
channel_sources:
Expand All @@ -11,13 +11,11 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '11'
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libprotobuf:
- '3.21'
ogre:
- '1.12'
- 4.23.2
target_platform:
- linux-64
zip_keys:
Expand Down
6 changes: 2 additions & 4 deletions .ci_support/linux_aarch64_ogre1.10.yaml → ...upport/linux_aarch64_libprotobuf3.21.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BUILD:
c_compiler:
- gcc
c_compiler_version:
- '11'
- '12'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -15,13 +15,11 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '11'
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-aarch64
libprotobuf:
- '3.21'
ogre:
- '1.10'
target_platform:
- linux-aarch64
zip_keys:
Expand Down
8 changes: 3 additions & 5 deletions .ci_support/linux_aarch64_ogre1.12.yaml → ...port/linux_aarch64_libprotobuf4.23.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BUILD:
c_compiler:
- gcc
c_compiler_version:
- '11'
- '12'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -15,13 +15,11 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '11'
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-aarch64
libprotobuf:
- '3.21'
ogre:
- '1.12'
- 4.23.2
target_platform:
- linux-aarch64
zip_keys:
Expand Down
7 changes: 0 additions & 7 deletions .ci_support/migrations/libarchive36.yaml
View file
Open in desktop

This file was deleted.

11 changes: 11 additions & 0 deletions .ci_support/migrations/protobuf423.yaml
View file
Open in desktop
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
6 changes: 2 additions & 4 deletions .ci_support/osx_64_ogre1.10.yaml → .ci_support/osx_64_libprotobuf3.21.yaml
View file
Open in desktop
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'
libarchive:
- '3.6'
libprotobuf:
Expand All @@ -20,8 +20,6 @@ macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
- '10.13'
ogre:
- '1.10'
target_platform:
- osx-64
zip_keys:
Expand Down
8 changes: 3 additions & 5 deletions .ci_support/osx_64_ogre1.12.yaml → .ci_support/osx_64_libprotobuf4.23.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,23 @@ 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'
libarchive:
- '3.6'
libprotobuf:
- '3.21'
- 4.23.2
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
- '10.13'
ogre:
- '1.12'
target_platform:
- osx-64
zip_keys:
Expand Down
6 changes: 2 additions & 4 deletions .ci_support/osx_arm64_ogre1.10.yaml → .ci_support/osx_arm64_libprotobuf3.21.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,21 @@ 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'
libarchive:
- '3.6'
libprotobuf:
- '3.21'
macos_machine:
- arm64-apple-darwin20.0.0
ogre:
- '1.10'
target_platform:
- osx-arm64
zip_keys:
Expand Down
8 changes: 3 additions & 5 deletions .ci_support/osx_arm64_ogre1.12.yaml → .ci_support/osx_arm64_libprotobuf4.23.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,21 @@ 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'
libarchive:
- '3.6'
libprotobuf:
- '3.21'
- 4.23.2
macos_machine:
- arm64-apple-darwin20.0.0
ogre:
- '1.12'
target_platform:
- osx-arm64
zip_keys:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/win_64_ogre1.10.yaml → .ci_support/win_64_libprotobuf3.21.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,5 @@ cxx_compiler:
- vs2019
libprotobuf:
- '3.21'
ogre:
- '1.10'
target_platform:
- win-64
4 changes: 1 addition & 3 deletions .ci_support/win_64_ogre1.12.yaml → .ci_support/win_64_libprotobuf4.23.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ channel_targets:
cxx_compiler:
- vs2019
libprotobuf:
- '3.21'
ogre:
- '1.12'
- 4.23.2
target_platform:
- win-64
4 changes: 2 additions & 2 deletions .scripts/build_steps.sh
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions .scripts/run_osx_build.sh
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop

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

Loading