Skip to content

Commit

Permalink
Merge pull request #225 from regro-cf-autotick-bot/rebuild-graphviz12…
Browse files Browse the repository at this point in the history 
…-0-1_h55054e

Rebuild for graphviz 12
  • Loading branch information
@traversaro
traversaro authored Aug 4, 2024
2 parents 971f07b + 9d65a4c commit 0cb4012
Show file tree
Hide file tree
Showing 28 changed files with 41 additions and 43 deletions.
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-win.yml
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 .ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ docker_image:
ffmpeg:
- '6'
graphviz:
- '11'
- '12'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ docker_image:
ffmpeg:
- '7'
graphviz:
- '11'
- '12'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ docker_image:
ffmpeg:
- '6'
graphviz:
- '11'
- '12'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ docker_image:
ffmpeg:
- '7'
graphviz:
- '11'
- '12'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ docker_image:
ffmpeg:
- '6'
graphviz:
- '11'
- '12'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ docker_image:
ffmpeg:
- '7'
graphviz:
- '11'
- '12'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ docker_image:
ffmpeg:
- '6'
graphviz:
- '11'
- '12'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ docker_image:
ffmpeg:
- '7'
graphviz:
- '11'
- '12'
hdf5:
- 1.14.3
libabseil:
Expand Down
8 changes: 0 additions & 8 deletions .ci_support/migrations/assimp541.yaml
View file

This file was deleted.

8 changes: 0 additions & 8 deletions .ci_support/migrations/graphviz11.yaml
View file

This file was deleted.

8 changes: 8 additions & 0 deletions .ci_support/migrations/graphviz12.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
__migrator:
build_number: 1
commit_message: Rebuild for graphviz 12
kind: version
migration_number: 1
graphviz:
- '12'
migrator_ts: 1722688838.199906
2 changes: 1 addition & 1 deletion .ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ cxx_compiler_version:
ffmpeg:
- '6'
graphviz:
- '11'
- '12'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ cxx_compiler_version:
ffmpeg:
- '7'
graphviz:
- '11'
- '12'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ cxx_compiler_version:
ffmpeg:
- '6'
graphviz:
- '11'
- '12'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ cxx_compiler_version:
ffmpeg:
- '7'
graphviz:
- '11'
- '12'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ cxx_compiler_version:
ffmpeg:
- '6'
graphviz:
- '11'
- '12'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ cxx_compiler_version:
ffmpeg:
- '7'
graphviz:
- '11'
- '12'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ cxx_compiler_version:
ffmpeg:
- '6'
graphviz:
- '11'
- '12'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ cxx_compiler_version:
ffmpeg:
- '7'
graphviz:
- '11'
- '12'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cxx_compiler:
ffmpeg:
- '6'
graphviz:
- '11'
- '12'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cxx_compiler:
ffmpeg:
- '7'
graphviz:
- '11'
- '12'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cxx_compiler:
ffmpeg:
- '6'
graphviz:
- '11'
- '12'
hdf5:
- 1.14.3
libabseil:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cxx_compiler:
ffmpeg:
- '7'
graphviz:
- '11'
- '12'
hdf5:
- 1.14.3
libabseil:
Expand Down
10 changes: 8 additions & 2 deletions .scripts/build_steps.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 .scripts/run_osx_build.sh
View file

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

4 changes: 2 additions & 2 deletions build-locally.py
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
@@ -1,6 +1,6 @@
{% set name = "gazebo" %}
{% set version = "11.14.0" %}
{% set build_number = 15 %}
{% set build_number = 16 %}

{% if GZ_CLI_NAME_VARIANT == "origname" %}
{% set build_number = build_number + 200 %}
Expand Down

0 comments on commit 0cb4012

Please sign in to comment.