Skip to content

Commit

Permalink
Rebuild for tinyxml2 10 (#59)
Browse files Browse the repository at this point in the history
automerged PR by conda-forge/automerge-action
  • Loading branch information
github-actions[bot] committed Jan 20, 2024
2 parents 1724a9c + 0124d96 commit b449d4a
Show file tree
Hide file tree
Showing 18 changed files with 81 additions and 197 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.

77 changes: 0 additions & 77 deletions .azure-pipelines/azure-pipelines-win.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ qt_main:
target_platform:
- linux-64
tinyxml2:
- '9'
- '10'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ qt_main:
target_platform:
- linux-aarch64
tinyxml2:
- '9'
- '10'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
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'
2 changes: 1 addition & 1 deletion .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ qt_main:
target_platform:
- osx-64
tinyxml2:
- '9'
- '10'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ qt_main:
target_platform:
- osx-arm64
tinyxml2:
- '9'
- '10'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
16 changes: 0 additions & 16 deletions .ci_support/win_64_.yaml

This file was deleted.

25 changes: 23 additions & 2 deletions .gitignore

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

9 changes: 6 additions & 3 deletions .scripts/build_steps.sh

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

80 changes: 0 additions & 80 deletions .scripts/create_conda_build_artifacts.bat

This file was deleted.

9 changes: 9 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.

13 changes: 10 additions & 3 deletions .scripts/run_osx_build.sh

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

14 changes: 12 additions & 2 deletions .scripts/run_win_build.bat

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

Loading

0 comments on commit b449d4a

Please sign in to comment.