Skip to content

Commit

Permalink
Rebuild for libprotobuf 4.25.1 (#42)
Browse files Browse the repository at this point in the history 
automerged PR by conda-forge/automerge-action
  • Loading branch information
@github-actions
github-actions[bot] committed Feb 5, 2024
2 parents 976bcc3 + eb98d59 commit 409a857
Show file tree
Hide file tree
Showing 35 changed files with 58 additions and 45 deletions.
2 changes: 1 addition & 1 deletion .ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ docker_image:
libabseil:
- '20230802'
libprotobuf:
- 4.24.4
- 4.25.1
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ docker_image:
libabseil:
- '20230802'
libprotobuf:
- 4.24.4
- 4.25.1
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ docker_image:
libabseil:
- '20230802'
libprotobuf:
- 4.24.4
- 4.25.1
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ docker_image:
libabseil:
- '20230802'
libprotobuf:
- 4.24.4
- 4.25.1
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_python3.9.____73_pypypython_implpypy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ docker_image:
libabseil:
- '20230802'
libprotobuf:
- 4.24.4
- 4.25.1
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ docker_image:
libabseil:
- '20230802'
libprotobuf:
- 4.24.4
- 4.25.1
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_python3.10.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ docker_image:
libabseil:
- '20230802'
libprotobuf:
- 4.24.4
- 4.25.1
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_python3.11.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ docker_image:
libabseil:
- '20230802'
libprotobuf:
- 4.24.4
- 4.25.1
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_python3.12.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ docker_image:
libabseil:
- '20230802'
libprotobuf:
- 4.24.4
- 4.25.1
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_python3.8.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ docker_image:
libabseil:
- '20230802'
libprotobuf:
- 4.24.4
- 4.25.1
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_python3.9.____73_pypypython_implpypy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ docker_image:
libabseil:
- '20230802'
libprotobuf:
- 4.24.4
- 4.25.1
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_python3.9.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ docker_image:
libabseil:
- '20230802'
libprotobuf:
- 4.24.4
- 4.25.1
pin_run_as_build:
python:
min_pin: x.x
Expand Down
10 changes: 10 additions & 0 deletions .ci_support/migrations/libprotobuf4251.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
__migrator:
build_number: 1
commit_message: Rebuild for libprotobuf 4.25.1
kind: version
migration_number: 1
libgrpc:
- "1.60"
libprotobuf:
- 4.25.1
migrator_ts: 1705841975.2201185
8 changes: 0 additions & 8 deletions .ci_support/migrations/tinyxml210.yaml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion .ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cxx_compiler_version:
libabseil:
- '20230802'
libprotobuf:
- 4.24.4
- 4.25.1
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cxx_compiler_version:
libabseil:
- '20230802'
libprotobuf:
- 4.24.4
- 4.25.1
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_python3.12.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cxx_compiler_version:
libabseil:
- '20230802'
libprotobuf:
- 4.24.4
- 4.25.1
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cxx_compiler_version:
libabseil:
- '20230802'
libprotobuf:
- 4.24.4
- 4.25.1
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_python3.9.____73_pypypython_implpypy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cxx_compiler_version:
libabseil:
- '20230802'
libprotobuf:
- 4.24.4
- 4.25.1
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cxx_compiler_version:
libabseil:
- '20230802'
libprotobuf:
- 4.24.4
- 4.25.1
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cxx_compiler_version:
libabseil:
- '20230802'
libprotobuf:
- 4.24.4
- 4.25.1
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cxx_compiler_version:
libabseil:
- '20230802'
libprotobuf:
- 4.24.4
- 4.25.1
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_python3.12.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cxx_compiler_version:
libabseil:
- '20230802'
libprotobuf:
- 4.24.4
- 4.25.1
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_python3.8.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cxx_compiler_version:
libabseil:
- '20230802'
libprotobuf:
- 4.24.4
- 4.25.1
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cxx_compiler_version:
libabseil:
- '20230802'
libprotobuf:
- 4.24.4
- 4.25.1
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_python3.10.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cxx_compiler:
libabseil:
- '20230802'
libprotobuf:
- 4.24.4
- 4.25.1
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_python3.11.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cxx_compiler:
libabseil:
- '20230802'
libprotobuf:
- 4.24.4
- 4.25.1
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_python3.12.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cxx_compiler:
libabseil:
- '20230802'
libprotobuf:
- 4.24.4
- 4.25.1
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_python3.8.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cxx_compiler:
libabseil:
- '20230802'
libprotobuf:
- 4.24.4
- 4.25.1
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_python3.9.____73_pypypython_implpypy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cxx_compiler:
libabseil:
- '20230802'
libprotobuf:
- 4.24.4
- 4.25.1
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_python3.9.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cxx_compiler:
libabseil:
- '20230802'
libprotobuf:
- 4.24.4
- 4.25.1
pin_run_as_build:
python:
min_pin: x.x
Expand Down
13 changes: 12 additions & 1 deletion .gitignore
View file

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

6 changes: 0 additions & 6 deletions .scripts/build_steps.sh
View file

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

6 changes: 6 additions & 0 deletions .scripts/run_docker_build.sh
View file

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
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ source:
- support_protobuf_crosscompilation.patch

build:
number: 4
number: 5

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

0 comments on commit 409a857

Please sign in to comment.