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 requirements in -pr- jobs on Windows #1275

Merged
merged 1 commit into from
Mar 4, 2025
+7 −5
Merged

Use requirements in -pr- jobs on Windows #1275

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions jenkins-scripts/dsl/gazebo_libs.dsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,16 +185,17 @@ 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, ws_checkout_dir, config_version)
void add_win_devel_bat_call(gz_win_ci_job, lib_name, ws_checkout_dir, ci_config)
{
def script_name_prefix = cleanup_library_name(lib_name)
def conda_env = ci_config.system.version
gz_win_ci_job.with
{
steps {
batchFile("""\
set VCS_DIRECTORY=${ws_checkout_dir}
set USE_PIXI=true
set CONDA_ENV_NAME=${config_version}
set CONDA_ENV_NAME=${conda_env}
if defined USE_PIXI (
if not exist "./scripts/conda/envs/%CONDA_ENV_NAME%" (
echo "Conda environment %CONDA_ENV_NAME% not found"
Expand All @@ -205,6 +206,8 @@ void add_win_devel_bat_call(gz_win_ci_job, lib_name, ws_checkout_dir, config_ver
""".stripIndent())
}
}
// Include the labels in the windows job
generate_label_by_requirements(gz_win_ci_job, lib_name, ci_config.requirements, 'win')
}

void generate_win_ci_job(gz_win_ci_job, lib_name, branch, ci_config)
Expand All @@ -217,11 +220,10 @@ void generate_win_ci_job(gz_win_ci_job, lib_name, branch, ci_config)
"gazebosim/${lib_name}",
branch,
ws_checkout_dir)
generate_label_by_requirements(gz_win_ci_job, lib_name, ci_config.requirements, 'win')
add_win_devel_bat_call(gz_win_ci_job,
lib_name,
ws_checkout_dir,
ci_config.system.version)
ci_config)
}


Expand Down Expand Up @@ -506,7 +508,7 @@ branch_index.each { lib_name, distro_configs ->
add_win_devel_bat_call(gz_win_ci_any_job,
lib_name,
ws_checkout_dir,
ci_config.system.version)
ci_config)
Globals.gazebodistro_branch = false
}
}
Expand Down