Skip to content

Commit

Permalink
Rebuild for tinyxml2 10 (#39)
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 Jan 8, 2024
2 parents cf19529 + c31ef3c commit 976bcc3
Show file tree
Hide file tree
Showing 40 changed files with 97 additions and 41 deletions.
3 changes: 3 additions & 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.

3 changes: 3 additions & 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.

3 changes: 3 additions & 0 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
Expand Up @@ -33,7 +33,7 @@ qt_main:
target_platform:
- linux-64
tinyxml2:
- '9'
- '10'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ qt_main:
target_platform:
- linux-64
tinyxml2:
- '9'
- '10'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ qt_main:
target_platform:
- linux-64
tinyxml2:
- '9'
- '10'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ qt_main:
target_platform:
- linux-64
tinyxml2:
- '9'
- '10'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ qt_main:
target_platform:
- linux-64
tinyxml2:
- '9'
- '10'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ qt_main:
target_platform:
- linux-64
tinyxml2:
- '9'
- '10'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ qt_main:
target_platform:
- linux-aarch64
tinyxml2:
- '9'
- '10'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ qt_main:
target_platform:
- linux-aarch64
tinyxml2:
- '9'
- '10'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ qt_main:
target_platform:
- linux-aarch64
tinyxml2:
- '9'
- '10'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ qt_main:
target_platform:
- linux-aarch64
tinyxml2:
- '9'
- '10'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ qt_main:
target_platform:
- linux-aarch64
tinyxml2:
- '9'
- '10'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ qt_main:
target_platform:
- linux-aarch64
tinyxml2:
- '9'
- '10'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
8 changes: 8 additions & 0 deletions .ci_support/migrations/tinyxml210.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
__migrator:
build_number: 1
commit_message: Rebuild for tinyxml2 10
kind: version
migration_number: 1
migrator_ts: 1704497957.887235
tinyxml2:
- '10'
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ qt_main:
target_platform:
- osx-64
tinyxml2:
- '9'
- '10'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ qt_main:
target_platform:
- osx-64
tinyxml2:
- '9'
- '10'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ qt_main:
target_platform:
- osx-64
tinyxml2:
- '9'
- '10'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ qt_main:
target_platform:
- osx-64
tinyxml2:
- '9'
- '10'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ qt_main:
target_platform:
- osx-64
tinyxml2:
- '9'
- '10'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ qt_main:
target_platform:
- osx-64
tinyxml2:
- '9'
- '10'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ qt_main:
target_platform:
- osx-arm64
tinyxml2:
- '9'
- '10'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ qt_main:
target_platform:
- osx-arm64
tinyxml2:
- '9'
- '10'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_python3.12.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ qt_main:
target_platform:
- osx-arm64
tinyxml2:
- '9'
- '10'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ qt_main:
target_platform:
- osx-arm64
tinyxml2:
- '9'
- '10'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ qt_main:
target_platform:
- osx-arm64
tinyxml2:
- '9'
- '10'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ qt_main:
target_platform:
- win-64
tinyxml2:
- '9'
- '10'
zip_keys:
- - python
- python_impl
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ qt_main:
target_platform:
- win-64
tinyxml2:
- '9'
- '10'
zip_keys:
- - python
- python_impl
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ qt_main:
target_platform:
- win-64
tinyxml2:
- '9'
- '10'
zip_keys:
- - python
- python_impl
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ qt_main:
target_platform:
- win-64
tinyxml2:
- '9'
- '10'
zip_keys:
- - python
- python_impl
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ qt_main:
target_platform:
- win-64
tinyxml2:
- '9'
- '10'
zip_keys:
- - python
- python_impl
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ qt_main:
target_platform:
- win-64
tinyxml2:
- '9'
- '10'
zip_keys:
- - python
- python_impl
14 changes: 12 additions & 2 deletions .gitignore

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

15 changes: 12 additions & 3 deletions .scripts/build_steps.sh

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

3 changes: 3 additions & 0 deletions .scripts/run_docker_build.sh

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

Loading

0 comments on commit 976bcc3

Please sign in to comment.