From 364f285ecf342c84b737aae666e37652b4e87e6c Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Fri, 29 Jan 2021 00:39:57 +0100 Subject: [PATCH] Enable ignition-gazebo CI on Windows (#388) --- jenkins-scripts/dsl/ignition.dsl | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/jenkins-scripts/dsl/ignition.dsl b/jenkins-scripts/dsl/ignition.dsl index 24618e10f..54d7218dc 100644 --- a/jenkins-scripts/dsl/ignition.dsl +++ b/jenkins-scripts/dsl/ignition.dsl @@ -627,8 +627,8 @@ ignition_software.each { ign_sw -> enable_testing(ign_sw)) ignition_win_ci_any_job.with { - // ign-gazebo/ign-launch still not ported completely to Windows - if (ign_sw == 'gazebo' || ign_sw == 'launch') + // ign-launch still not ported completely to Windows + if (ign_sw == 'launch') disabled() steps { @@ -663,8 +663,12 @@ ignition_software.each { ign_sw -> ignition_win_ci_job.with { - // ign-gazebo/ign-launch still not ported completely to Windows - if (ign_sw == 'gazebo' || ign_sw == 'launch') + // ign-gazebo only works in main by now (ign-gazebo5) + if (ign_sw == 'gazebo' && branch != 'main') + disabled() + + // ign-launch still not ported completely to Windows + if (ign_sw == 'launch') disabled() triggers {