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

Jump to bottom

Add CMake warnings to Windows/OsX jobs #510

Merged
merged 3 commits into from
Oct 7, 2021
Merged

Add CMake warnings to Windows/OsX jobs #510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ae200f
Add CMake warnings to Windows/OsX jobs
j-rivero Sep 9, 2021
0bd80fa
Support to selectively enable ignition software for Cmake warnings
j-rivero Oct 6, 2021
566028a
Enable warnings for ign-plugin, not ign-cmake
scpeters Oct 7, 2021
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
11 changes: 10 additions & 1 deletion jenkins-scripts/dsl/_configs_/OSRFBrewCompilation.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import javaposse.jobdsl.dsl.Job
*/
class OSRFBrewCompilation extends OSRFOsXBase
{
static void create(Job job, enable_testing = true)
static void create(Job job, enable_testing = true, enable_cmake_warnings = false)
{
OSRFOsXBase.create(job)

Expand All @@ -38,6 +38,15 @@ class OSRFBrewCompilation extends OSRFOsXBase
reportEncoding()
skipSymbolicLinks(false)
}
if (enable_cmake_warnings) {
'io.jenkins.plugins.analysis.warnings.Cmake' {
id()
name()
pattern()
reportEncoding()
skipSymbolicLinks(false)
}
}
}

sourceCodeEncoding()
Expand Down
5 changes: 3 additions & 2 deletions jenkins-scripts/dsl/_configs_/OSRFBrewCompilationAnyGitHub.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ class OSRFBrewCompilationAnyGitHub
String github_repo,
boolean enable_testing = true,
ArrayList supported_branches = [],
boolean enable_github_pr_integration = true)
boolean enable_github_pr_integration = true,
boolean enable_cmake_warnings = false)
{
OSRFBrewCompilation.create(job, enable_testing)
OSRFBrewCompilation.create(job, enable_testing, enable_cmake_warnings)

GenericAnyJobGitHub.create(job, github_repo,
supported_branches,
Expand Down
11 changes: 10 additions & 1 deletion jenkins-scripts/dsl/_configs_/OSRFWinCompilation.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import javaposse.jobdsl.dsl.Job
*/
class OSRFWinCompilation extends OSRFWinBase
{
static void create(Job job, enable_testing = true)
static void create(Job job, enable_testing = true, enable_cmake_warnings = false)
{
OSRFWinBase.create(job)

Expand All @@ -36,6 +36,15 @@ class OSRFWinCompilation extends OSRFWinBase
reportEncoding()
skipSymbolicLinks(false)
}
if (enable_cmake_warnings) {
'io.jenkins.plugins.analysis.warnings.Cmake' {
id()
name()
pattern()
reportEncoding()
skipSymbolicLinks(false)
}
}
}

sourceCodeEncoding()
Expand Down
5 changes: 3 additions & 2 deletions jenkins-scripts/dsl/_configs_/OSRFWinCompilationAnyGitHub.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ class OSRFWinCompilationAnyGitHub
String github_repo,
boolean enable_testing = true,
ArrayList supported_branches = [],
boolean enable_github_pr_integration = true)
boolean enable_github_pr_integration = true,
boolean enable_cmake_warnings = false)
{
OSRFWinCompilation.create(job, enable_testing)
OSRFWinCompilation.create(job, enable_testing, enable_cmake_warnings)

/* Properties from generic any */
GenericAnyJobGitHub.create(job,
Expand Down
45 changes: 41 additions & 4 deletions jenkins-scripts/dsl/ignition.dsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,21 @@ ignition_gpu = [ 'gazebo',
'gui',
'rendering',
'sensors' ]
// DESC: software does not support cmake warnings enabled
ignition_no_cmake_warnings = [ 'cmake',
'common',
'fuel-tools',
'gazebo',
'gui',
'launch',
'math',
'msgs',
'physics',
'rendering',
'sensors',
'tools',
'transport',
'utils' ]
// DESC: software does not have tests
ignition_no_test = [ 'tools' ]
// DESC: major series supported and released. The branches get CI, install pkg
Expand Down Expand Up @@ -104,6 +119,9 @@ Globals.extra_emails = "caguero@osrfoundation.org"
// shell command to inject in all bash steps
GLOBAL_SHELL_CMD=''

GITHUB_SUPPORT_ALL_BRANCHES = []
ENABLE_GITHUB_PR_INTEGRATION = true

// Fortress release needed to invalidate cache to solve problem with bug in
// gzdev docker installation. Will be disable automatically in 1st May 2021
today = new Date().format( 'yyyyMMdd' )
Expand Down Expand Up @@ -250,6 +268,14 @@ void include_gpu_label_if_needed(Job job, String ign_software_name)
}
}

boolean enable_cmake_warnings(String ign_software_name)
{
if (ign_software_name in ignition_no_cmake_warnings)
return false

return true
}

boolean enable_testing(String ign_software_name)
{
if (ign_software_name in ignition_no_test)
Expand Down Expand Up @@ -462,10 +488,15 @@ all_debbuilders().each { debbuilder_name ->
// 1. any job
ignition_software.each { ign_sw ->
String ignition_brew_ci_any_job_name = "ignition_${ign_sw}-ci-pr_any-homebrew-amd64"


def ignition_brew_ci_any_job = job(ignition_brew_ci_any_job_name)
OSRFBrewCompilationAnyGitHub.create(ignition_brew_ci_any_job,
"ignitionrobotics/ign-${ign_sw}",
enable_testing(ign_sw))
enable_testing(ign_sw),
GITHUB_SUPPORT_ALL_BRANCHES,
ENABLE_GITHUB_PR_INTEGRATION,
enable_cmake_warnings(ign_sw))
ignition_brew_ci_any_job.with
{
steps {
Expand All @@ -489,7 +520,9 @@ ignition_software.each { ign_sw ->
// 2. main, release branches
all_branches("${ign_sw}").each { branch ->
def ignition_brew_ci_job = job("ignition_${ign_sw}-ci-${branch}-homebrew-amd64")
OSRFBrewCompilation.create(ignition_brew_ci_job, enable_testing(ign_sw))
OSRFBrewCompilation.create(ignition_brew_ci_job,
enable_testing(ign_sw),
enable_cmake_warnings(ign_sw))
OSRFGitHub.create(ignition_brew_ci_job,
"ignitionrobotics/ign-${ign_sw}",
"${branch}", "ign-${ign_sw}")
Expand Down Expand Up @@ -584,7 +617,9 @@ ignition_software.each { ign_sw ->
OSRFWinCompilationAnyGitHub.create(ignition_win_ci_any_job,
"ignitionrobotics/ign-${ign_sw}",
enable_testing(ign_sw),
supported_branches)
supported_branches,
ENABLE_GITHUB_PR_INTEGRATION,
enable_cmake_warnings(ign_sw))
ignition_win_ci_any_job.with
{
steps {
Expand Down Expand Up @@ -612,7 +647,9 @@ ignition_software.each { ign_sw ->
}

def ignition_win_ci_job = job(ignition_win_ci_job_name)
OSRFWinCompilation.create(ignition_win_ci_job, enable_testing(ign_sw))
OSRFWinCompilation.create(ignition_win_ci_job,
enable_testing(ign_sw),
enable_cmake_warnings(ign_sw))
OSRFGitHub.create(ignition_win_ci_job,
"ignitionrobotics/ign-${ign_sw}",
"${branch}", "ign-${ign_sw}")
Expand Down