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.

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

Enable ign-launch5 windows jobs. Add it to Fortress #534

Merged
merged 1 commit into from
Oct 11, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions jenkins-scripts/dsl/ignition.dsl
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@ ignition_software.each { ign_sw ->

// ign-launch only support Windows from ign-launch5
if (ign_sw == 'launch')
supported_branches = [ 'main' ]
supported_branches = [ 'ign-launch5', 'main' ]

def ignition_win_ci_any_job = job(ignition_win_ci_any_job_name)
OSRFWinCompilationAnyGitHub.create(ignition_win_ci_any_job,
Expand Down Expand Up @@ -662,8 +662,8 @@ ignition_software.each { ign_sw ->
if (branch == 'ign-gazebo3' || branch == 'ign-gazebo4')
disabled()

// ign-launch still not ported completely to Windows
if (ign_sw == 'launch' && branch != 'main')
// ign-launch was not ported to windows until 5
if (branch == 'ign-launch2' || branch == 'ign-launch3' || branch == 'ign-launch4')
disabled()

triggers {
Expand Down
1 change: 1 addition & 0 deletions jenkins-scripts/dsl/ignition_collection.dsl
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@ ignition_collection_jobs =
'ign_fuel-tools-ign-7-win',
'ign_gazebo-ign-6-win',
'ign_gui-ign-6-win',
'ign_launch-ign-5-win',
'ign_physics-ign-5-win',
'ign_plugin-ign-1-win',
'ign_rendering-ign-6-win',
Expand Down