Skip to content

Commit

Permalink
Rebuild for libprotobuf 4.25.3 (#23)
Browse files Browse the repository at this point in the history
automerged PR by conda-forge/automerge-action
  • Loading branch information
github-actions[bot] authored Mar 22, 2024
2 parents 4258eb6 + 4c34b55 commit 68e6385
Show file tree
Hide file tree
Showing 11 changed files with 40 additions and 9 deletions.
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.

1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-osx.yml

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

4 changes: 3 additions & 1 deletion .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ docker_image:
libopencv:
- 4.9.0
libprotobuf:
- 4.25.2
- 4.25.3
libyarp:
- 3.9.0
target_platform:
- linux-64
tbb_devel:
Expand Down
23 changes: 23 additions & 0 deletions .ci_support/migrations/libgrpc162_libprotobuf4253.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
__migrator:
build_number: 1
commit_message: Rebuild for libprotobuf 4.25.3
kind: version
migration_number: 1
exclude:
- abseil-cpp
- grpc-cpp
- libprotobuf
- protobuf
libgrpc:
- "1.62"
libprotobuf:
- 4.25.3
# keep abseil bump from libabseil20240116_libgrpc161_libprotobuf4252;
# this ensures that this migration applies also without the previous one
libabseil:
- "20240116"
# already covered by libabseil20230802_libgrpc157_libprotobuf4234,
# which we cannot delete yet, but keep for clarity
MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64]
- "10.13" # [osx and x86_64]
migrator_ts: 1709522594.9193177
4 changes: 3 additions & 1 deletion .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ cxx_compiler_version:
libopencv:
- 4.9.0
libprotobuf:
- 4.25.2
- 4.25.3
libyarp:
- 3.9.0
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
Expand Down
4 changes: 3 additions & 1 deletion .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ cxx_compiler:
libopencv:
- 4.9.0
libprotobuf:
- 4.25.2
- 4.25.3
libyarp:
- 3.9.0
target_platform:
- win-64
tbb_devel:
Expand Down
2 changes: 1 addition & 1 deletion .scripts/build_steps.sh

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

2 changes: 1 addition & 1 deletion .scripts/run_osx_build.sh

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

2 changes: 1 addition & 1 deletion .scripts/run_win_build.bat

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

4 changes: 2 additions & 2 deletions azure-pipelines.yml

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

2 changes: 1 addition & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ source:
sha256: 862bf7a4ff5054bef088eeffae525c8c900e6f91407ba5f017b7d39212e0a7bd

build:
number: 1
number: 2

outputs:
- name: {{ cxx_name }}
Expand Down

0 comments on commit 68e6385

Please sign in to comment.