From a8f7e729e6567197dce1940672ea6eb0ee142c37 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 9 Nov 2023 12:37:45 +0100 Subject: [PATCH 01/18] Rename all .bat files to use gz Signed-off-by: Jose Luis Rivero --- ...windows-amd64.bat => gz_cmake-default-devel-windows-amd64.bat} | 0 ...indows-amd64.bat => gz_common-default-devel-windows-amd64.bat} | 0 ...ws-amd64.bat => gz_fuel-tools-default-devel-windows-amd64.bat} | 0 ...l-windows-amd64.bat => gz_gui-default-devel-windows-amd64.bat} | 0 ...indows-amd64.bat => gz_launch-default-devel-windows-amd64.bat} | 0 ...-windows-amd64.bat => gz_math-default-devel-windows-amd64.bat} | 0 ...-windows-amd64.bat => gz_msgs-default-devel-windows-amd64.bat} | 0 ...ndows-amd64.bat => gz_physics-default-devel-windows-amd64.bat} | 0 ...indows-amd64.bat => gz_plugin-default-devel-windows-amd64.bat} | 0 ...ows-amd64.bat => gz_rendering-default-devel-windows-amd64.bat} | 0 ...-windows-amd64.bat => gz_rndf-default-devel-windows-amd64.bat} | 0 ...ndows-amd64.bat => gz_sensors-default-devel-windows-amd64.bat} | 0 ...l-windows-amd64.bat => gz_sim-default-devel-windows-amd64.bat} | 0 ...windows-amd64.bat => gz_tools-default-devel-windows-amd64.bat} | 0 ...ows-amd64.bat => gz_transport-default-devel-windows-amd64.bat} | 0 ...windows-amd64.bat => gz_utils-default-devel-windows-amd64.bat} | 0 16 files changed, 0 insertions(+), 0 deletions(-) rename jenkins-scripts/{ign_cmake-default-devel-windows-amd64.bat => gz_cmake-default-devel-windows-amd64.bat} (100%) rename jenkins-scripts/{ign_common-default-devel-windows-amd64.bat => gz_common-default-devel-windows-amd64.bat} (100%) rename jenkins-scripts/{ign_fuel-tools-default-devel-windows-amd64.bat => gz_fuel-tools-default-devel-windows-amd64.bat} (100%) rename jenkins-scripts/{ign_gui-default-devel-windows-amd64.bat => gz_gui-default-devel-windows-amd64.bat} (100%) rename jenkins-scripts/{ign_launch-default-devel-windows-amd64.bat => gz_launch-default-devel-windows-amd64.bat} (100%) rename jenkins-scripts/{ign_math-default-devel-windows-amd64.bat => gz_math-default-devel-windows-amd64.bat} (100%) rename jenkins-scripts/{ign_msgs-default-devel-windows-amd64.bat => gz_msgs-default-devel-windows-amd64.bat} (100%) rename jenkins-scripts/{ign_physics-default-devel-windows-amd64.bat => gz_physics-default-devel-windows-amd64.bat} (100%) rename jenkins-scripts/{ign_plugin-default-devel-windows-amd64.bat => gz_plugin-default-devel-windows-amd64.bat} (100%) rename jenkins-scripts/{ign_rendering-default-devel-windows-amd64.bat => gz_rendering-default-devel-windows-amd64.bat} (100%) rename jenkins-scripts/{ign_rndf-default-devel-windows-amd64.bat => gz_rndf-default-devel-windows-amd64.bat} (100%) rename jenkins-scripts/{ign_sensors-default-devel-windows-amd64.bat => gz_sensors-default-devel-windows-amd64.bat} (100%) rename jenkins-scripts/{ign_gazebo-default-devel-windows-amd64.bat => gz_sim-default-devel-windows-amd64.bat} (100%) rename jenkins-scripts/{ign_tools-default-devel-windows-amd64.bat => gz_tools-default-devel-windows-amd64.bat} (100%) rename jenkins-scripts/{ign_transport-default-devel-windows-amd64.bat => gz_transport-default-devel-windows-amd64.bat} (100%) rename jenkins-scripts/{ign_utils-default-devel-windows-amd64.bat => gz_utils-default-devel-windows-amd64.bat} (100%) diff --git a/jenkins-scripts/ign_cmake-default-devel-windows-amd64.bat b/jenkins-scripts/gz_cmake-default-devel-windows-amd64.bat similarity index 100% rename from jenkins-scripts/ign_cmake-default-devel-windows-amd64.bat rename to jenkins-scripts/gz_cmake-default-devel-windows-amd64.bat diff --git a/jenkins-scripts/ign_common-default-devel-windows-amd64.bat b/jenkins-scripts/gz_common-default-devel-windows-amd64.bat similarity index 100% rename from jenkins-scripts/ign_common-default-devel-windows-amd64.bat rename to jenkins-scripts/gz_common-default-devel-windows-amd64.bat diff --git a/jenkins-scripts/ign_fuel-tools-default-devel-windows-amd64.bat b/jenkins-scripts/gz_fuel-tools-default-devel-windows-amd64.bat similarity index 100% rename from jenkins-scripts/ign_fuel-tools-default-devel-windows-amd64.bat rename to jenkins-scripts/gz_fuel-tools-default-devel-windows-amd64.bat diff --git a/jenkins-scripts/ign_gui-default-devel-windows-amd64.bat b/jenkins-scripts/gz_gui-default-devel-windows-amd64.bat similarity index 100% rename from jenkins-scripts/ign_gui-default-devel-windows-amd64.bat rename to jenkins-scripts/gz_gui-default-devel-windows-amd64.bat diff --git a/jenkins-scripts/ign_launch-default-devel-windows-amd64.bat b/jenkins-scripts/gz_launch-default-devel-windows-amd64.bat similarity index 100% rename from jenkins-scripts/ign_launch-default-devel-windows-amd64.bat rename to jenkins-scripts/gz_launch-default-devel-windows-amd64.bat diff --git a/jenkins-scripts/ign_math-default-devel-windows-amd64.bat b/jenkins-scripts/gz_math-default-devel-windows-amd64.bat similarity index 100% rename from jenkins-scripts/ign_math-default-devel-windows-amd64.bat rename to jenkins-scripts/gz_math-default-devel-windows-amd64.bat diff --git a/jenkins-scripts/ign_msgs-default-devel-windows-amd64.bat b/jenkins-scripts/gz_msgs-default-devel-windows-amd64.bat similarity index 100% rename from jenkins-scripts/ign_msgs-default-devel-windows-amd64.bat rename to jenkins-scripts/gz_msgs-default-devel-windows-amd64.bat diff --git a/jenkins-scripts/ign_physics-default-devel-windows-amd64.bat b/jenkins-scripts/gz_physics-default-devel-windows-amd64.bat similarity index 100% rename from jenkins-scripts/ign_physics-default-devel-windows-amd64.bat rename to jenkins-scripts/gz_physics-default-devel-windows-amd64.bat diff --git a/jenkins-scripts/ign_plugin-default-devel-windows-amd64.bat b/jenkins-scripts/gz_plugin-default-devel-windows-amd64.bat similarity index 100% rename from jenkins-scripts/ign_plugin-default-devel-windows-amd64.bat rename to jenkins-scripts/gz_plugin-default-devel-windows-amd64.bat diff --git a/jenkins-scripts/ign_rendering-default-devel-windows-amd64.bat b/jenkins-scripts/gz_rendering-default-devel-windows-amd64.bat similarity index 100% rename from jenkins-scripts/ign_rendering-default-devel-windows-amd64.bat rename to jenkins-scripts/gz_rendering-default-devel-windows-amd64.bat diff --git a/jenkins-scripts/ign_rndf-default-devel-windows-amd64.bat b/jenkins-scripts/gz_rndf-default-devel-windows-amd64.bat similarity index 100% rename from jenkins-scripts/ign_rndf-default-devel-windows-amd64.bat rename to jenkins-scripts/gz_rndf-default-devel-windows-amd64.bat diff --git a/jenkins-scripts/ign_sensors-default-devel-windows-amd64.bat b/jenkins-scripts/gz_sensors-default-devel-windows-amd64.bat similarity index 100% rename from jenkins-scripts/ign_sensors-default-devel-windows-amd64.bat rename to jenkins-scripts/gz_sensors-default-devel-windows-amd64.bat diff --git a/jenkins-scripts/ign_gazebo-default-devel-windows-amd64.bat b/jenkins-scripts/gz_sim-default-devel-windows-amd64.bat similarity index 100% rename from jenkins-scripts/ign_gazebo-default-devel-windows-amd64.bat rename to jenkins-scripts/gz_sim-default-devel-windows-amd64.bat diff --git a/jenkins-scripts/ign_tools-default-devel-windows-amd64.bat b/jenkins-scripts/gz_tools-default-devel-windows-amd64.bat similarity index 100% rename from jenkins-scripts/ign_tools-default-devel-windows-amd64.bat rename to jenkins-scripts/gz_tools-default-devel-windows-amd64.bat diff --git a/jenkins-scripts/ign_transport-default-devel-windows-amd64.bat b/jenkins-scripts/gz_transport-default-devel-windows-amd64.bat similarity index 100% rename from jenkins-scripts/ign_transport-default-devel-windows-amd64.bat rename to jenkins-scripts/gz_transport-default-devel-windows-amd64.bat diff --git a/jenkins-scripts/ign_utils-default-devel-windows-amd64.bat b/jenkins-scripts/gz_utils-default-devel-windows-amd64.bat similarity index 100% rename from jenkins-scripts/ign_utils-default-devel-windows-amd64.bat rename to jenkins-scripts/gz_utils-default-devel-windows-amd64.bat From 0365d62d4792b267edffca88bddff77ad4084fb5 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 9 Nov 2023 12:38:17 +0100 Subject: [PATCH 02/18] Added win to ci_configs Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/gz-collections.yaml | 31 +++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml index f96a1a503..953d1a6e2 100644 --- a/jenkins-scripts/dsl/gz-collections.yaml +++ b/jenkins-scripts/dsl/gz-collections.yaml @@ -96,6 +96,7 @@ collections: configs: - bionic - brew + - win packaging: configs: - bionic @@ -546,6 +547,36 @@ ci_configs: - gz-tools - gz-transport - gz-utils + - name: win + system: + so: windows + distribution: windows + version: "10" + arch: amd64 + requirements: + exclude: + all: + - ign-citadel + - gz-fortress + - gz-garden + - gz-harmonic + - gz-ionic + - __upcoming__ + cmake_warnings_disabled: + - gz-cmake + - gz-common + - gz-fuel-tools + - gz-sim + - gz-gui + - gz-launch + - gz-math + - gz-msgs + - gz-physics + - gz-rendering + - gz-sensors + - gz-tools + - gz-transport + - gz-utils packaging_configs: - name: bionic system: From 8cca5720baff4dd1d75e3bd303cb4b1a0f9bd167 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 9 Nov 2023 12:42:48 +0100 Subject: [PATCH 03/18] Fix fuel tools expected .bat name Signed-off-by: Jose Luis Rivero --- ...ws-amd64.bat => gz_fuel_tools-default-devel-windows-amd64.bat} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename jenkins-scripts/{gz_fuel-tools-default-devel-windows-amd64.bat => gz_fuel_tools-default-devel-windows-amd64.bat} (100%) diff --git a/jenkins-scripts/gz_fuel-tools-default-devel-windows-amd64.bat b/jenkins-scripts/gz_fuel_tools-default-devel-windows-amd64.bat similarity index 100% rename from jenkins-scripts/gz_fuel-tools-default-devel-windows-amd64.bat rename to jenkins-scripts/gz_fuel_tools-default-devel-windows-amd64.bat From abeeed4aff29307e753bf28bf54057c8f57e57b4 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 9 Nov 2023 12:57:43 +0100 Subject: [PATCH 04/18] Use win in all collections Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/gz-collections.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml index 953d1a6e2..464890c79 100644 --- a/jenkins-scripts/dsl/gz-collections.yaml +++ b/jenkins-scripts/dsl/gz-collections.yaml @@ -177,6 +177,7 @@ collections: configs: - focal - brew + - win packaging: configs: - focal @@ -257,6 +258,7 @@ collections: configs: - focal - brew + - win packaging: configs: - focal @@ -337,6 +339,7 @@ collections: configs: - jammy - brew + - win packaging: configs: - jammy @@ -413,6 +416,7 @@ collections: configs: - jammy - brew + - win packaging: configs: - jammy @@ -432,6 +436,7 @@ collections: configs: - jammy - brew + - win packaging: configs: - jammy From c0a68bd0a52f84454a60fc267636b87a3caba6b0 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 9 Nov 2023 13:02:27 +0100 Subject: [PATCH 05/18] Change dsl_check to include all scripts Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/dsl_checks.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins-scripts/dsl/dsl_checks.bash b/jenkins-scripts/dsl/dsl_checks.bash index d08afb440..3ad78c9ec 100755 --- a/jenkins-scripts/dsl/dsl_checks.bash +++ b/jenkins-scripts/dsl/dsl_checks.bash @@ -15,7 +15,7 @@ if [[ -n ${not_null} ]]; then fi # Check for existing scripts -for f in $(grep -Eh -o './scripts/.*.bash' -- *.xml | sort | uniq); do +for f in $(grep -Eh -o './scripts/.*' -- *.xml | awk '{print $1}' | sed 's/"//' | sort | uniq); do if ! test -f "${f}"; then echo "${f} script not found in the repository" fi From 5427740a3423c855c4a65b67120f995db9afcb8d Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 9 Nov 2023 13:03:12 +0100 Subject: [PATCH 06/18] Add new ci-win jobs to gazebo_libs Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/gazebo_libs.dsl | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/jenkins-scripts/dsl/gazebo_libs.dsl b/jenkins-scripts/dsl/gazebo_libs.dsl index b801ec114..460196854 100644 --- a/jenkins-scripts/dsl/gazebo_libs.dsl +++ b/jenkins-scripts/dsl/gazebo_libs.dsl @@ -173,6 +173,26 @@ void generate_brew_ci_job(gz_brew_ci_job, lib_name, branch, ci_config) } } +void generate_win_ci_job(gz_win_ci_job, lib_name, branch, ci_config) +{ + def script_name_prefix = cleanup_library_name(lib_name) + OSRFWinCompilation.create(gz_win_ci_job, + is_testing_enabled(lib_name, ci_config), + are_cmake_warnings_enabled(lib_name, ci_config)) + OSRFGitHub.create(gz_win_ci_job, + "gazebosim/${lib_name}", + branch, + lib_name) + gz_win_ci_job.with + { + steps { + batchFile("""\ + call "./scripts/jenkins-scripts/${script_name_prefix}-default-devel-windows-amd64.bat" + """.stripIndent()) + } + } +} + def ciconf_per_lib_index = [:].withDefault { [:] } def pkgconf_per_src_index = [:].withDefault { [:] } generate_ciconfigs_by_lib(gz_collections_yaml, ciconf_per_lib_index, pkgconf_per_src_index) @@ -204,6 +224,14 @@ ciconf_per_lib_index.each { lib_name, lib_configs -> } else if (ci_config.system.so == 'darwin') { gz_ci_job = job("${gz_job_name_prefix}-ci-${branch_name}-homebrew-${arch}") generate_brew_ci_job(gz_ci_job, lib_name, branch_name, ci_config) + } else if (ci_config.system.so == 'windows') { + branch_number = branch_name - lib_name + Globals.gazebodistro_branch = true + gz_ci_job = job("${gz_job_name_prefix}-${branch_number}-win") + generate_win_ci_job(gz_ci_job, lib_name, branch_name, ci_config) + Globals.gazebodistro_branch = false + } else { + assert false : "Unexpected config.system.so type: ${ci_config.system.so}" } gz_ci_job.with From b1c798ce65c7f56da679ca8eded7d43ebb1be109 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 9 Nov 2023 13:09:20 +0100 Subject: [PATCH 07/18] Remove -ci- daily from ignition.dsl Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/ignition.dsl | 46 -------------------------------- 1 file changed, 46 deletions(-) diff --git a/jenkins-scripts/dsl/ignition.dsl b/jenkins-scripts/dsl/ignition.dsl index 0c2296cd9..96f2fe846 100644 --- a/jenkins-scripts/dsl/ignition.dsl +++ b/jenkins-scripts/dsl/ignition.dsl @@ -690,52 +690,6 @@ gz_software.each { gz_sw -> // add ci-pr_any to the list for CIWorkflow ci_pr_any_list[gz_sw] << gz_win_ci_any_job_name - - // 2. main, release branches - all_branches("${gz_sw}").each { branch -> - if (is_a_colcon_package(gz_sw)) { - // colcon uses long paths and windows has a hard limit of 260 chars. Keep - // names minimal - if (branch == 'main') - branch_name = "ci" - else - branch_name = branch - gz_sw - // Deal with the special case of changing gazebo name by sim - branch_name = branch_name.replace('gz-sim','gz-') - gz_win_ci_job_name = "ign_${gz_sw}-${branch_name}-win" - } else { - gz_win_ci_job_name = "ignition_${gz_sw}-ci-${branch}-windows7-amd64" - } - - def gz_win_ci_job = job(gz_win_ci_job_name) - OSRFWinCompilation.create(gz_win_ci_job, - enable_testing(gz_sw), - enable_cmake_warnings(gz_sw)) - OSRFGitHub.create(gz_win_ci_job, - "gazebosim/gz-${gz_sw}", - "${branch}") - - gz_win_ci_job.with - { - // ign-gazebo only works on Windows from ign-gazebo5 - if (branch == 'ign-gazebo3') - disabled() - - // ign-launch was not ported to windows until 5 - if (branch == 'ign-launch2') - disabled() - - triggers { - scm('@daily') - } - - steps { - batchFile("""\ - call "./scripts/jenkins-scripts/ign_${gz_sw}-default-devel-windows-amd64.bat" - """.stripIndent()) - } - } - } } // Main CI workflow From 2689cb73cc6be84027053a2dae536acab9b044ca Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 9 Nov 2023 14:57:42 +0100 Subject: [PATCH 08/18] Add -ci-pr_any- win jobs Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/gazebo_libs.dsl | 34 +++++++++++++++++++++-------- jenkins-scripts/dsl/ignition.dsl | 6 +---- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/jenkins-scripts/dsl/gazebo_libs.dsl b/jenkins-scripts/dsl/gazebo_libs.dsl index 460196854..200dc7ee9 100644 --- a/jenkins-scripts/dsl/gazebo_libs.dsl +++ b/jenkins-scripts/dsl/gazebo_libs.dsl @@ -153,7 +153,6 @@ void generate_ci_job(gz_ci_job, lib_name, branch, ci_config, void generate_brew_ci_job(gz_brew_ci_job, lib_name, branch, ci_config) { - def script_name_prefix = cleanup_library_name(lib_name) OSRFBrewCompilation.create(gz_brew_ci_job, is_testing_enabled(lib_name, ci_config), are_cmake_warnings_enabled(lib_name, ci_config)) @@ -173,16 +172,9 @@ void generate_brew_ci_job(gz_brew_ci_job, lib_name, branch, ci_config) } } -void generate_win_ci_job(gz_win_ci_job, lib_name, branch, ci_config) +void add_win_devel_bat_call(gz_win_ci_job, lib_name) { def script_name_prefix = cleanup_library_name(lib_name) - OSRFWinCompilation.create(gz_win_ci_job, - is_testing_enabled(lib_name, ci_config), - are_cmake_warnings_enabled(lib_name, ci_config)) - OSRFGitHub.create(gz_win_ci_job, - "gazebosim/${lib_name}", - branch, - lib_name) gz_win_ci_job.with { steps { @@ -193,6 +185,18 @@ void generate_win_ci_job(gz_win_ci_job, lib_name, branch, ci_config) } } +void generate_win_ci_job(gz_win_ci_job, lib_name, branch, ci_config) +{ + OSRFWinCompilation.create(gz_win_ci_job, + is_testing_enabled(lib_name, ci_config), + are_cmake_warnings_enabled(lib_name, ci_config)) + OSRFGitHub.create(gz_win_ci_job, + "gazebosim/${lib_name}", + branch, + lib_name) + add_win_devel_bat_call(gz_win_ci_job, lib_name) +} + def ciconf_per_lib_index = [:].withDefault { [:] } def pkgconf_per_src_index = [:].withDefault { [:] } generate_ciconfigs_by_lib(gz_collections_yaml, ciconf_per_lib_index, pkgconf_per_src_index) @@ -327,6 +331,18 @@ ciconf_per_lib_index.each { lib_name, lib_configs -> """.stripIndent()) } } + } else if (ci_config.system.so == 'windows') { + def gz_win_ci_any_job_name = "${gz_job_name_prefix}-pr-win" + def gz_win_ci_any_job = job(gz_win_ci_any_job_name) + Globals.gazebodistro_branch = true + OSRFWinCompilationAnyGitHub.create(gz_win_ci_any_job, + "gazebosim/${lib_name}", + is_testing_enabled(lib_name, ci_config), + branch_names, + ENABLE_GITHUB_PR_INTEGRATION, + are_cmake_warnings_enabled(lib_name, ci_config)) + add_win_devel_bat_call(gz_win_ci_any_job_name, lib_name) + Globals.gazebodistro_branch = false } } //en of lib_configs } // end of lib diff --git a/jenkins-scripts/dsl/ignition.dsl b/jenkins-scripts/dsl/ignition.dsl index 96f2fe846..6e7796556 100644 --- a/jenkins-scripts/dsl/ignition.dsl +++ b/jenkins-scripts/dsl/ignition.dsl @@ -681,11 +681,7 @@ gz_software.each { gz_sw -> enable_cmake_warnings(gz_sw)) gz_win_ci_any_job.with { - steps { - batchFile("""\ - call "./scripts/jenkins-scripts/ign_${gz_sw}-default-devel-windows-amd64.bat" - """.stripIndent()) - } + description 'Automatic generated job by DSL jenkins. Stub job for migration, not doing any check' } // add ci-pr_any to the list for CIWorkflow From 30cc15d61afea8059d7658767c666071f464d707 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 9 Nov 2023 17:24:39 +0100 Subject: [PATCH 09/18] Remove sdformat generated Windows jobs Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/sdformat.dsl | 44 +------------------------------- 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/jenkins-scripts/dsl/sdformat.dsl b/jenkins-scripts/dsl/sdformat.dsl index 9ef8b57b0..0639eab12 100644 --- a/jenkins-scripts/dsl/sdformat.dsl +++ b/jenkins-scripts/dsl/sdformat.dsl @@ -214,49 +214,7 @@ sdformat_supported_versions.each { version -> } } -// -------------------------------------------------------------- -// WINDOWS: CI job - -// 1. any - String ci_build_any_job_name_win7 = "sdformat-pr-win" - def sdformat_win_ci_any_job = job(ci_build_any_job_name_win7) - OSRFWinCompilationAnyGitHub.create(sdformat_win_ci_any_job, - "gazebosim/sdformat") - sdformat_win_ci_any_job.with - { - steps { - batchFile("""\ - call "./scripts/jenkins-scripts/sdformat-default-devel-windows-amd64.bat" - """.stripIndent()) - } - } - -// 2. main / @ SCM/Daily -all_versions = sdformat_supported_versions + 'main' -all_versions.each { version -> - // Use replace to get branch names to sync with ignition packages and the - // format of $branch-$version - def sdformat_win_ci_job = job("sdformat-sdf-" + version.replace('sdformat','') + "-win") - OSRFWinCompilation.create(sdformat_win_ci_job) - OSRFGitHub.create(sdformat_win_ci_job, "gazebosim/sdformat", - get_sdformat_branch_name(version)) - sdformat_win_ci_job.with - { - triggers { - scm('@daily') - } - - steps { - batchFile("""\ - set USE_GZ_ZIP=FALSE - call "./scripts/jenkins-scripts/sdformat-default-devel-windows-amd64.bat" - """.stripIndent()) - } - } -} - // Create the manual all-platforms jobs def sdformat_ci_main = pipelineJob("sdformat-ci-manual_any") OSRFCIWorkFlowMultiAnyGitHub.create(sdformat_ci_main, - [ci_build_any_job_name_linux, - ci_build_any_job_name_win7]) + [ci_build_any_job_name_linux]) From 320da30d54677df0282e9e89f3dc41d74fe15d74 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 9 Nov 2023 17:46:18 +0100 Subject: [PATCH 10/18] Rework the link checker Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/dsl_checks.bash | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/jenkins-scripts/dsl/dsl_checks.bash b/jenkins-scripts/dsl/dsl_checks.bash index 3ad78c9ec..b6774e219 100755 --- a/jenkins-scripts/dsl/dsl_checks.bash +++ b/jenkins-scripts/dsl/dsl_checks.bash @@ -14,8 +14,17 @@ if [[ -n ${not_null} ]]; then exit 1 fi -# Check for existing scripts -for f in $(grep -Eh -o './scripts/.*' -- *.xml | awk '{print $1}' | sed 's/"//' | sort | uniq); do +# Check for existing scripts. Lines: +# 1. lookg for ./scripts/. and exclude comment lnes +# 2. replaces %WORKSPACE% by . +# 3. grab only the path from ./scripts/ +# 4. remove spurious " +# 5. sor and uniq to get clean output +for f in $(grep -Eh './scripts/.*' -- *.xml | grep -v '//' | \ + sed 's/%WORKSPACE%/./g' | \ + grep -Eh -o './scripts/.*' | awk '{print $1}' | \ + sed 's/"//g' | \ + sort | uniq); do if ! test -f "${f}"; then echo "${f} script not found in the repository" fi From 46e5f7da384b57919779cf432f5a5f4ac8a58c9d Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 9 Nov 2023 17:46:35 +0100 Subject: [PATCH 11/18] Replace the vcpkg tester job by using hardcode gz-sim Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/core.dsl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/jenkins-scripts/dsl/core.dsl b/jenkins-scripts/dsl/core.dsl index add1a9785..dde1485cb 100644 --- a/jenkins-scripts/dsl/core.dsl +++ b/jenkins-scripts/dsl/core.dsl @@ -31,10 +31,9 @@ update_vcpkg_snapshot_job.with } } -def ignition_testing_software = 'gazebo' def testing_vcpkg_job = job("_vcpkg_testing_snapshot") OSRFWinCompilationAnyGitHub.create(testing_vcpkg_job, - "gazebosim/ign-${ignition_testing_software}", + "gazebosim/gz-sim", NO_TESTING, NO_BRANCHES, NO_GITHUB_PR_INTEGRATION) testing_vcpkg_job.with { @@ -48,7 +47,7 @@ testing_vcpkg_job.with batchFile("""\ call "%WORKSPACE%/scripts/jenkins-scripts/vcpkg-bootstrap.bat" || exit /B %errorlevel% - call "%WORKSPACE%/scripts/jenkins-scripts/ign_${ignition_testing_software}-default-devel-windows-amd64.bat" + call "%WORKSPACE%/scripts/jenkins-scripts/gz_sim-default-devel-windows-amd64.bat" """.stripIndent()) } } From ac88612688d1e813e6bb5cca2b5f87193a80c123 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 9 Nov 2023 17:46:53 +0100 Subject: [PATCH 12/18] Fix for right parameter in software call Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/gazebo_libs.dsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins-scripts/dsl/gazebo_libs.dsl b/jenkins-scripts/dsl/gazebo_libs.dsl index 200dc7ee9..bcf6a6550 100644 --- a/jenkins-scripts/dsl/gazebo_libs.dsl +++ b/jenkins-scripts/dsl/gazebo_libs.dsl @@ -341,7 +341,7 @@ ciconf_per_lib_index.each { lib_name, lib_configs -> branch_names, ENABLE_GITHUB_PR_INTEGRATION, are_cmake_warnings_enabled(lib_name, ci_config)) - add_win_devel_bat_call(gz_win_ci_any_job_name, lib_name) + add_win_devel_bat_call(gz_win_ci_any_job, lib_name) Globals.gazebodistro_branch = false } } //en of lib_configs From d46309c6ef4937e803535f7f94aa01290f155c18 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Tue, 14 Nov 2023 12:47:09 +0100 Subject: [PATCH 13/18] Ignore CMake warnings on SDFormat for Brew and Win Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/gz-collections.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml index 03c9c9fb4..8ba4d29f0 100644 --- a/jenkins-scripts/dsl/gz-collections.yaml +++ b/jenkins-scripts/dsl/gz-collections.yaml @@ -552,6 +552,7 @@ ci_configs: - gz-tools - gz-transport - gz-utils + - sdformat - name: win system: so: windows @@ -582,6 +583,7 @@ ci_configs: - gz-tools - gz-transport - gz-utils + - sdformat packaging_configs: - name: bionic system: From 28e6928ee939ed944af84da53acad0a7b6a0f595 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Tue, 14 Nov 2023 12:50:30 +0100 Subject: [PATCH 14/18] Exclude collections for brew and windows Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/ignition_collection.dsl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jenkins-scripts/dsl/ignition_collection.dsl b/jenkins-scripts/dsl/ignition_collection.dsl index 7a046c26c..d5096bf3e 100644 --- a/jenkins-scripts/dsl/ignition_collection.dsl +++ b/jenkins-scripts/dsl/ignition_collection.dsl @@ -515,7 +515,8 @@ gz_collections_yaml.collections.each { collection -> // to yaml efforts. Remove from here when -install- and -win- jobs are implemented // in gazebo_libs if (ci_config.exclude.all?.contains(gz_collection_name) || - ci_config.name == "brew" ) + ci_config.system.so == 'darwin' || + ci_config.system.so == 'windows') return // INSTALL JOBS: From d88d1ebce25734cb00b2f0508a4f7cc6e3d153fb Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Tue, 14 Nov 2023 16:48:58 +0100 Subject: [PATCH 15/18] Do not change sdformat Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/gz-collections.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml index 8ba4d29f0..0eac8e851 100644 --- a/jenkins-scripts/dsl/gz-collections.yaml +++ b/jenkins-scripts/dsl/gz-collections.yaml @@ -552,7 +552,6 @@ ci_configs: - gz-tools - gz-transport - gz-utils - - sdformat - name: win system: so: windows From b0cf83bb5c5eba36e3d2359d2d49d42f9df5bd9d Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Tue, 14 Nov 2023 17:47:29 +0100 Subject: [PATCH 16/18] Use VCS_DIRECTORY directly in DSL for checkout dir Change scripts to respect previous values of VCS_DIRECTORY and inject the value directly from DSL to deal with changes in repository directory. Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/gazebo_libs.dsl | 12 +++++++----- .../gz_cmake-default-devel-windows-amd64.bat | 2 +- .../gz_common-default-devel-windows-amd64.bat | 2 +- .../gz_fuel_tools-default-devel-windows-amd64.bat | 2 +- .../gz_gui-default-devel-windows-amd64.bat | 2 +- .../gz_launch-default-devel-windows-amd64.bat | 2 +- .../gz_math-default-devel-windows-amd64.bat | 2 +- .../gz_msgs-default-devel-windows-amd64.bat | 2 +- .../gz_physics-default-devel-windows-amd64.bat | 2 +- .../gz_plugin-default-devel-windows-amd64.bat | 2 +- .../gz_rendering-default-devel-windows-amd64.bat | 2 +- .../gz_rndf-default-devel-windows-amd64.bat | 2 +- .../gz_sensors-default-devel-windows-amd64.bat | 2 +- .../gz_sim-default-devel-windows-amd64.bat | 2 +- .../gz_tools-default-devel-windows-amd64.bat | 2 +- .../gz_transport-default-devel-windows-amd64.bat | 2 +- .../gz_utils-default-devel-windows-amd64.bat | 2 +- .../sdformat-default-devel-windows-amd64.bat | 2 +- 18 files changed, 24 insertions(+), 22 deletions(-) diff --git a/jenkins-scripts/dsl/gazebo_libs.dsl b/jenkins-scripts/dsl/gazebo_libs.dsl index bf57dfa35..09feb2e34 100644 --- a/jenkins-scripts/dsl/gazebo_libs.dsl +++ b/jenkins-scripts/dsl/gazebo_libs.dsl @@ -182,13 +182,14 @@ void generate_brew_ci_job(gz_brew_ci_job, lib_name, branch, ci_config) add_brew_shell_build_step(gz_brew_ci_job, lib_name, ws_checkout_dir) } -void add_win_devel_bat_call(gz_win_ci_job, lib_name) +void add_win_devel_bat_call(gz_win_ci_job, lib_name, ws_checkout_dir) { def script_name_prefix = cleanup_library_name(lib_name) gz_win_ci_job.with { steps { batchFile("""\ + set VCS_DIRECTORY=${ws_checkout_dir} call "./scripts/jenkins-scripts/${script_name_prefix}-default-devel-windows-amd64.bat" """.stripIndent()) } @@ -197,14 +198,15 @@ void add_win_devel_bat_call(gz_win_ci_job, lib_name) void generate_win_ci_job(gz_win_ci_job, lib_name, branch, ci_config) { + def ws_checkout_dir = lib_name OSRFWinCompilation.create(gz_win_ci_job, is_testing_enabled(lib_name, ci_config), are_cmake_warnings_enabled(lib_name, ci_config)) OSRFGitHub.create(gz_win_ci_job, "gazebosim/${lib_name}", branch, - lib_name) - add_win_devel_bat_call(gz_win_ci_job, lib_name) + ws_checkout_dir) + add_win_devel_bat_call(gz_win_ci_job, lib_name, ws_checkout_dir) } def ciconf_per_lib_index = [:].withDefault { [:] } @@ -222,6 +224,7 @@ ciconf_per_lib_index.each { lib_name, lib_configs -> def gz_job_name_prefix = lib_name.replaceAll('-','_') def distro = ci_config.system.version def arch = ci_config.system.arch + def ws_checkout_dir = lib_name if (ci_config.exclude.all?.contains(lib_name)) return assert(lib_name) @@ -325,7 +328,6 @@ ciconf_per_lib_index.each { lib_name, lib_configs -> // -------------------------------------------------------------- def gz_brew_ci_any_job_name = "${gz_job_name_prefix}-ci-pr_any-homebrew-amd64" def gz_brew_ci_any_job = job(gz_brew_ci_any_job_name) - def ws_checkout_dir = lib_name OSRFBrewCompilationAnyGitHub.create(gz_brew_ci_any_job, "gazebosim/${lib_name}", is_testing_enabled(lib_name, ci_config), @@ -343,7 +345,7 @@ ciconf_per_lib_index.each { lib_name, lib_configs -> branch_names, ENABLE_GITHUB_PR_INTEGRATION, are_cmake_warnings_enabled(lib_name, ci_config)) - add_win_devel_bat_call(gz_win_ci_any_job, lib_name) + add_win_devel_bat_call(gz_win_ci_any_job, lib_name, ws_checkout_dir) Globals.gazebodistro_branch = false } } //en of lib_configs diff --git a/jenkins-scripts/gz_cmake-default-devel-windows-amd64.bat b/jenkins-scripts/gz_cmake-default-devel-windows-amd64.bat index 99e0e8373..3ee9322c4 100644 --- a/jenkins-scripts/gz_cmake-default-devel-windows-amd64.bat +++ b/jenkins-scripts/gz_cmake-default-devel-windows-amd64.bat @@ -1,6 +1,6 @@ set SCRIPT_DIR=%~dp0 -set VCS_DIRECTORY=gz-cmake +if not defined VCS_DIRECTORY set VCS_DIRECTORY=gz-cmake set PLATFORM_TO_BUILD=x86_amd64 set IGN_CLEAN_WORKSPACE=true diff --git a/jenkins-scripts/gz_common-default-devel-windows-amd64.bat b/jenkins-scripts/gz_common-default-devel-windows-amd64.bat index 7d0937264..0c7f82614 100644 --- a/jenkins-scripts/gz_common-default-devel-windows-amd64.bat +++ b/jenkins-scripts/gz_common-default-devel-windows-amd64.bat @@ -1,6 +1,6 @@ set SCRIPT_DIR=%~dp0 -set VCS_DIRECTORY=gz-common +if not defined VCS_DIRECTORY set VCS_DIRECTORY=gz-common set PLATFORM_TO_BUILD=x86_amd64 set IGN_CLEAN_WORKSPACE=true diff --git a/jenkins-scripts/gz_fuel_tools-default-devel-windows-amd64.bat b/jenkins-scripts/gz_fuel_tools-default-devel-windows-amd64.bat index 590f32e41..0401f1aa3 100644 --- a/jenkins-scripts/gz_fuel_tools-default-devel-windows-amd64.bat +++ b/jenkins-scripts/gz_fuel_tools-default-devel-windows-amd64.bat @@ -1,6 +1,6 @@ set SCRIPT_DIR=%~dp0 -set VCS_DIRECTORY=gz-fuel-tools +if not defined VCS_DIRECTORY set VCS_DIRECTORY=gz-fuel-tools set PLATFORM_TO_BUILD=x86_amd64 set IGN_CLEAN_WORKSPACE=true set COLCON_PACKAGE=gz-fuel_tools diff --git a/jenkins-scripts/gz_gui-default-devel-windows-amd64.bat b/jenkins-scripts/gz_gui-default-devel-windows-amd64.bat index 3590abbac..1b1a95e9e 100644 --- a/jenkins-scripts/gz_gui-default-devel-windows-amd64.bat +++ b/jenkins-scripts/gz_gui-default-devel-windows-amd64.bat @@ -1,7 +1,7 @@ @echo on set SCRIPT_DIR=%~dp0 -set VCS_DIRECTORY=gz-gui +if not defined VCS_DIRECTORY set VCS_DIRECTORY=gz-gui set PLATFORM_TO_BUILD=x86_amd64 set IGN_CLEAN_WORKSPACE=true set COLCON_PACKAGE=gz-gui diff --git a/jenkins-scripts/gz_launch-default-devel-windows-amd64.bat b/jenkins-scripts/gz_launch-default-devel-windows-amd64.bat index 0a7533df7..e78bb2e91 100644 --- a/jenkins-scripts/gz_launch-default-devel-windows-amd64.bat +++ b/jenkins-scripts/gz_launch-default-devel-windows-amd64.bat @@ -1,6 +1,6 @@ set SCRIPT_DIR=%~dp0 -set VCS_DIRECTORY=gz-launch +if not defined VCS_DIRECTORY set VCS_DIRECTORY=gz-launch set PLATFORM_TO_BUILD=x86_amd64 set IGN_CLEAN_WORKSPACE=true set COLCON_PACKAGE=gz-launch diff --git a/jenkins-scripts/gz_math-default-devel-windows-amd64.bat b/jenkins-scripts/gz_math-default-devel-windows-amd64.bat index 0c383bf0a..4341c5e50 100644 --- a/jenkins-scripts/gz_math-default-devel-windows-amd64.bat +++ b/jenkins-scripts/gz_math-default-devel-windows-amd64.bat @@ -1,6 +1,6 @@ set SCRIPT_DIR=%~dp0 -set VCS_DIRECTORY=gz-math +if not defined VCS_DIRECTORY set VCS_DIRECTORY=gz-math set PLATFORM_TO_BUILD=x86_amd64 set IGN_CLEAN_WORKSPACE=true set COLCON_PACKAGE=gz-math diff --git a/jenkins-scripts/gz_msgs-default-devel-windows-amd64.bat b/jenkins-scripts/gz_msgs-default-devel-windows-amd64.bat index 0d93f69db..7a94c6220 100644 --- a/jenkins-scripts/gz_msgs-default-devel-windows-amd64.bat +++ b/jenkins-scripts/gz_msgs-default-devel-windows-amd64.bat @@ -1,6 +1,6 @@ set SCRIPT_DIR=%~dp0 -set VCS_DIRECTORY=gz-msgs +if not defined VCS_DIRECTORY set VCS_DIRECTORY=gz-msgs set PLATFORM_TO_BUILD=x86_amd64 set IGN_CLEAN_WORKSPACE=true diff --git a/jenkins-scripts/gz_physics-default-devel-windows-amd64.bat b/jenkins-scripts/gz_physics-default-devel-windows-amd64.bat index e07c16131..a4f509554 100644 --- a/jenkins-scripts/gz_physics-default-devel-windows-amd64.bat +++ b/jenkins-scripts/gz_physics-default-devel-windows-amd64.bat @@ -1,6 +1,6 @@ set SCRIPT_DIR=%~dp0 -set VCS_DIRECTORY=gz-physics +if not defined VCS_DIRECTORY set VCS_DIRECTORY=gz-physics set PLATFORM_TO_BUILD=x86_amd64 set IGN_CLEAN_WORKSPACE=true set COLCON_PACKAGE=gz-physics diff --git a/jenkins-scripts/gz_plugin-default-devel-windows-amd64.bat b/jenkins-scripts/gz_plugin-default-devel-windows-amd64.bat index 63ad952f0..024c8f427 100644 --- a/jenkins-scripts/gz_plugin-default-devel-windows-amd64.bat +++ b/jenkins-scripts/gz_plugin-default-devel-windows-amd64.bat @@ -1,6 +1,6 @@ set SCRIPT_DIR=%~dp0 -set VCS_DIRECTORY=gz-plugin +if not defined VCS_DIRECTORY set VCS_DIRECTORY=gz-plugin set PLATFORM_TO_BUILD=x86_amd64 set IGN_CLEAN_WORKSPACE=true diff --git a/jenkins-scripts/gz_rendering-default-devel-windows-amd64.bat b/jenkins-scripts/gz_rendering-default-devel-windows-amd64.bat index 00cfbb20e..994cb7095 100644 --- a/jenkins-scripts/gz_rendering-default-devel-windows-amd64.bat +++ b/jenkins-scripts/gz_rendering-default-devel-windows-amd64.bat @@ -1,7 +1,7 @@ @echo on set SCRIPT_DIR=%~dp0 -set VCS_DIRECTORY=gz-rendering +if not defined VCS_DIRECTORY set VCS_DIRECTORY=gz-rendering set PLATFORM_TO_BUILD=x86_amd64 set IGN_CLEAN_WORKSPACE=true set COLCON_PACKAGE=gz-rendering diff --git a/jenkins-scripts/gz_rndf-default-devel-windows-amd64.bat b/jenkins-scripts/gz_rndf-default-devel-windows-amd64.bat index db6644516..c5a9874ba 100644 --- a/jenkins-scripts/gz_rndf-default-devel-windows-amd64.bat +++ b/jenkins-scripts/gz_rndf-default-devel-windows-amd64.bat @@ -1,6 +1,6 @@ set SCRIPT_DIR=%~dp0 -set VCS_DIRECTORY=ign-rndf +if not defined VCS_DIRECTORY set VCS_DIRECTORY=ign-rndf set PLATFORM_TO_BUILD=x86_amd64 set IGN_CLEAN_WORKSPACE=true diff --git a/jenkins-scripts/gz_sensors-default-devel-windows-amd64.bat b/jenkins-scripts/gz_sensors-default-devel-windows-amd64.bat index 99528bf07..74cd1b98d 100644 --- a/jenkins-scripts/gz_sensors-default-devel-windows-amd64.bat +++ b/jenkins-scripts/gz_sensors-default-devel-windows-amd64.bat @@ -1,7 +1,7 @@ @echo on set SCRIPT_DIR=%~dp0 -set VCS_DIRECTORY=gz-sensors +if not defined VCS_DIRECTORY set VCS_DIRECTORY=gz-sensors set PLATFORM_TO_BUILD=x86_amd64 set IGN_CLEAN_WORKSPACE=true set COLCON_PACKAGE=gz-sensors diff --git a/jenkins-scripts/gz_sim-default-devel-windows-amd64.bat b/jenkins-scripts/gz_sim-default-devel-windows-amd64.bat index 9a803131f..15c413b51 100644 --- a/jenkins-scripts/gz_sim-default-devel-windows-amd64.bat +++ b/jenkins-scripts/gz_sim-default-devel-windows-amd64.bat @@ -1,7 +1,7 @@ @echo on set SCRIPT_DIR=%~dp0 -set VCS_DIRECTORY=gz-sim +if not defined VCS_DIRECTORY set VCS_DIRECTORY=gz-sim set PLATFORM_TO_BUILD=x86_amd64 set IGN_CLEAN_WORKSPACE=true set COLCON_PACKAGE=gz-sim diff --git a/jenkins-scripts/gz_tools-default-devel-windows-amd64.bat b/jenkins-scripts/gz_tools-default-devel-windows-amd64.bat index 89b4adff8..aab9a6f95 100644 --- a/jenkins-scripts/gz_tools-default-devel-windows-amd64.bat +++ b/jenkins-scripts/gz_tools-default-devel-windows-amd64.bat @@ -1,6 +1,6 @@ set SCRIPT_DIR=%~dp0 -set VCS_DIRECTORY=gz-tools +if not defined VCS_DIRECTORY set VCS_DIRECTORY=gz-tools set PLATFORM_TO_BUILD=x86_amd64 set IGN_CLEAN_WORKSPACE=true diff --git a/jenkins-scripts/gz_transport-default-devel-windows-amd64.bat b/jenkins-scripts/gz_transport-default-devel-windows-amd64.bat index fd6baa68d..f1946bdbe 100644 --- a/jenkins-scripts/gz_transport-default-devel-windows-amd64.bat +++ b/jenkins-scripts/gz_transport-default-devel-windows-amd64.bat @@ -2,7 +2,7 @@ set SCRIPT_DIR=%~dp0 -set VCS_DIRECTORY=gz-transport +if not defined VCS_DIRECTORY set VCS_DIRECTORY=gz-transport set PLATFORM_TO_BUILD=amd64 set IGN_CLEAN_WORKSPACE=true diff --git a/jenkins-scripts/gz_utils-default-devel-windows-amd64.bat b/jenkins-scripts/gz_utils-default-devel-windows-amd64.bat index a65bdb866..a1230317e 100644 --- a/jenkins-scripts/gz_utils-default-devel-windows-amd64.bat +++ b/jenkins-scripts/gz_utils-default-devel-windows-amd64.bat @@ -3,7 +3,7 @@ set SCRIPT_DIR=%~dp0 :: ign-utils shouldn't have external dependencies -set VCS_DIRECTORY=gz-utils +if not defined VCS_DIRECTORY set VCS_DIRECTORY=gz-utils set PLATFORM_TO_BUILD=x86_amd64 set IGN_CLEAN_WORKSPACE=true set COLCON_PACKAGE=gz-utils diff --git a/jenkins-scripts/sdformat-default-devel-windows-amd64.bat b/jenkins-scripts/sdformat-default-devel-windows-amd64.bat index e302ab7b1..1f57e581e 100644 --- a/jenkins-scripts/sdformat-default-devel-windows-amd64.bat +++ b/jenkins-scripts/sdformat-default-devel-windows-amd64.bat @@ -2,7 +2,7 @@ set SCRIPT_DIR=%~dp0 -set VCS_DIRECTORY=sdformat +if not defined VCS_DIRECTORY set VCS_DIRECTORY=sdformat set PLATFORM_TO_BUILD=x86_amd64 set IGN_CLEAN_WORKSPACE=true From 94f1dcfb366d4098eb7133d60475125ec0232a4f Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Tue, 14 Nov 2023 18:08:02 +0100 Subject: [PATCH 17/18] Sort the files changed in CI Signed-off-by: Jose Luis Rivero --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 02a6c8290..524dd498f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -84,7 +84,7 @@ jobs: if: steps.dsl_check.outputs.run_job == 'true' run: | # somehow the Jenkins views changed the portlet_ id on every run. - diff -qr -I '.*dashboard_portlet_.*.*' /tmp/current_xml_configuration /tmp/pr_xml_configuration > /tmp/xml_config_files_changed.diff || true + diff -qr -I '.*dashboard_portlet_.*.*' /tmp/current_xml_configuration /tmp/pr_xml_configuration | sort > /tmp/xml_config_files_changed.diff || true diff -ur -I '.*dashboard_portlet_.*.*' /tmp/current_xml_configuration /tmp/pr_xml_configuration > /tmp/xml_config_content_changed.diff || true diff -ur /tmp/current_log_generated /tmp/pr_log_generated > /tmp/log_content_changed.diff || true - name: Archive files changes From 9a0e28a665abf0478d81c85d7aaafaaca93f3d25 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Tue, 14 Nov 2023 18:15:07 +0100 Subject: [PATCH 18/18] Ignore CMake warnings on windows for ign- projects Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/gz-collections.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml index 0eac8e851..75c0bf4e1 100644 --- a/jenkins-scripts/dsl/gz-collections.yaml +++ b/jenkins-scripts/dsl/gz-collections.yaml @@ -582,6 +582,20 @@ ci_configs: - gz-tools - gz-transport - gz-utils + - ign-cmake + - ign-common + - ign-fuel-tools + - ign-sim + - ign-gui + - ign-launch + - ign-math + - ign-msgs + - ign-physics + - ign-rendering + - ign-sensors + - ign-tools + - ign-transport + - ign-utils - sdformat packaging_configs: - name: bionic