Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use stable branches for gz-sensors and gz-transport in harmonic #997

Merged
merged 2 commits into from
Aug 30, 2023
Merged

Use stable branches for gz-sensors and gz-transport in harmonic #997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
241b6f0
Use stable branches for gz-sensors and gz-transport inharmonic
iche033 Aug 30, 2023
84416a5
update sensors8 win
iche033 Aug 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions jenkins-scripts/dsl/gz-collections.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,15 @@ collections:
- name: gz-transport
major_version: 13
repo:
current_branch: main
current_branch: gz-transport13
- name: gz-gui
major_version: 8
repo:
current_branch: main
- name: gz-sensors
major_version: 8
repo:
current_branch: main
current_branch: gz-sensors8
- name: gz-physics
major_version: 7
repo:
Expand Down
8 changes: 3 additions & 5 deletions jenkins-scripts/dsl/ignition.dsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ gz_branches = [ 'cmake' : [ '3' ],
'msgs' : [ '9', '10'],
'physics' : [ '6' ],
'plugin' : [ '2' ],
'rendering' : [ '7' , '8'],
'sensors' : [ '7' ],
'rendering' : [ '7', '8' ],
'sensors' : [ '7', '8' ],
'sim' : [ '7' ],
'tools' : [ '2' ],
'transport' : [ '12' ],
'transport' : [ '12', '13' ],
'utils' : [ '2' ]]
// DESC: prerelease branches are managed as any other supported branches for
// special cases different to major branches: get compilation CI on the branch
Expand All @@ -87,9 +87,7 @@ gz_extra_debbuild = [ 'gui8',
'fuel-tools9',
'launch7',
'physics7',
'sensors8',
'sim8',
'transport13',
'utils1' // see comment https://github.com/gazebo-tooling/release-tools/pull/431#issuecomment-815099918
]
// DESC: exclude ignition from generate any install testing job
Expand Down
8 changes: 4 additions & 4 deletions jenkins-scripts/dsl/ignition_collection.dsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ gz_collection_jobs =
'ign_physics-gz-6-win',
'ign_plugin-gz-2-win',
'ign_rendering-gz-8-win',
'ign_sensors-ci-win',
'ign_sensors-gz-8-win',
'ign_tools-gz-2-win',
'ign_transport-gz-13-win',
'ign_utils-gz-2-win',
Expand All @@ -300,10 +300,10 @@ gz_collection_jobs =
'gz_physics-ci-gz-physics6-jammy-amd64',
'gz_plugin-ci-gz-plugin2-jammy-amd64',
'gz_rendering-ci-gz-rendering8-jammy-amd64',
'gz_sensors-ci-main-jammy-amd64',
'gz_sensors-ci-gz-sensors8-jammy-amd64',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also update ign_sensors_ci-win?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated. 84416a5

'gz_sim-ci-main-jammy-amd64',
'gz_tools-ci-gz-tools2-jammy-amd64',
'gz_transport-ci-main-jammy-amd64',
'gz_transport-ci-gz-transport13-jammy-amd64',
'gz_utils-ci-gz-utils2-jammy-amd64',
'ignition_cmake-ci-gz-cmake3-homebrew-amd64',
'ignition_common-ci-gz-common5-homebrew-amd64',
Expand All @@ -317,7 +317,7 @@ gz_collection_jobs =
'ignition_physics-ci-gz-physics6-homebrew-amd64',
'ignition_plugin-ci-gz-plugin2-homebrew-amd64',
'ignition_rendering-ci-gz-rendering8-homebrew-amd64',
'ignition_sensors-ci-main-homebrew-amd64',
'ignition_sensors-ci-gz-sensors8-homebrew-amd64',
'ignition_tools-ci-gz-tools2-homebrew-amd64',
'ignition_transport-ci-gz-transport13-homebrew-amd64',
'ignition_utils-ci-gz-utils2-homebrew-amd64',
Expand Down