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

Missing Fortress/Garden jammy packaging in gz-collections.yaml #1154

Merged
merged 6 commits into from
Jul 31, 2024
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
30 changes: 16 additions & 14 deletions jenkins-scripts/dsl/gazebo_libs.dsl
Original file line number Diff line number Diff line change
Expand Up @@ -560,23 +560,25 @@ pkgconf_per_src_index.each { pkg_src, pkg_src_configs ->
def pkg_system = pkg_config.system
// - CI-INSTALL jobs ------------------------------------------------
pkg_system.arch.each { arch ->
def linux_install_job_name = generate_linux_install(
pkg_src,
canonical_lib_name,
pkg_system.version,
arch)
def brew_install_job_name = generate_brew_install(
pkg_src,
canonical_lib_name,
arch)

def install_job_name = ""
if (pkg_system.so == 'linux') {
install_job_name = generate_linux_install(
pkg_src,
canonical_lib_name,
pkg_system.version,
arch)
} else if (pkg_system.so == 'darwin') {
install_job_name = generate_brew_install(
pkg_src,
canonical_lib_name,
arch)
} else {
assert("Unexpected pkg_system.so: " + pkg_system.so)
}
pkg_src_config.getValue().each { index_entry ->
logging_list['install_ci'].add(
[collection: index_entry.collection,
job_name: linux_install_job_name])
logging_list['install_ci'].add(
[collection: index_entry.collection,
job_name: brew_install_job_name])
job_name: install_job_name])
}
}
}
Expand Down
15 changes: 15 additions & 0 deletions jenkins-scripts/dsl/gz-collections.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ collections:
packaging:
configs:
- focal
- brew
linux:
ignore_major_version:
- gz-citadel
Expand Down Expand Up @@ -181,6 +182,8 @@ collections:
packaging:
configs:
- focal
- jammy
- brew
linux:
ignore_major_version:
- gz-fortress
Expand Down Expand Up @@ -262,6 +265,8 @@ collections:
packaging:
configs:
- focal
- jammy
- brew
linux:
ignore_major_version:
- gz-garden
Expand Down Expand Up @@ -344,6 +349,7 @@ collections:
packaging:
configs:
- jammy
- brew
linux:
ignore_major_version:
- gz-harmonic
Expand Down Expand Up @@ -425,6 +431,7 @@ collections:
packaging:
configs:
- noble
- brew
linux:
ignore_major_version:
- gz-ionic
Expand All @@ -445,6 +452,7 @@ collections:
packaging:
configs:
- noble
- brew
ci_configs:
- name: focal
system:
Expand Down Expand Up @@ -734,3 +742,10 @@ packaging_configs:
- "export MAKE_JOBS=1"
exclude:
- __upcoming__
- name: brew
system:
so: darwin
distribution: macOSX
version: all
arch:
- amd64
34 changes: 34 additions & 0 deletions jenkins-scripts/dsl/logs/generated_jobs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -367,72 +367,106 @@ install_ci citadel gz_transport8-install_bottle-homebrew-amd64
install_ci citadel sdformat9-install-pkg-focal-amd64
install_ci citadel sdformat9-install_bottle-homebrew-amd64
install_ci fortress gz_cmake2-install-pkg-focal-amd64
install_ci fortress gz_cmake2-install-pkg-jammy-amd64
install_ci fortress gz_cmake2-install_bottle-homebrew-amd64
install_ci fortress gz_common4-install-pkg-focal-amd64
install_ci fortress gz_common4-install-pkg-jammy-amd64
install_ci fortress gz_common4-install_bottle-homebrew-amd64
install_ci fortress gz_fortress-install-pkg-focal-amd64
install_ci fortress gz_fortress-install-pkg-jammy-amd64
install_ci fortress gz_fortress-install_bottle-homebrew-amd64
install_ci fortress gz_fuel_tools7-install-pkg-focal-amd64
install_ci fortress gz_fuel_tools7-install-pkg-jammy-amd64
install_ci fortress gz_fuel_tools7-install_bottle-homebrew-amd64
install_ci fortress gz_gui6-install-pkg-focal-amd64
install_ci fortress gz_gui6-install-pkg-jammy-amd64
install_ci fortress gz_gui6-install_bottle-homebrew-amd64
install_ci fortress gz_launch5-install-pkg-focal-amd64
install_ci fortress gz_launch5-install-pkg-jammy-amd64
install_ci fortress gz_launch5-install_bottle-homebrew-amd64
install_ci fortress gz_math6-install-pkg-focal-amd64
install_ci fortress gz_math6-install-pkg-jammy-amd64
install_ci fortress gz_math6-install_bottle-homebrew-amd64
install_ci fortress gz_msgs8-install-pkg-focal-amd64
install_ci fortress gz_msgs8-install-pkg-jammy-amd64
install_ci fortress gz_msgs8-install_bottle-homebrew-amd64
install_ci fortress gz_physics5-install-pkg-focal-amd64
install_ci fortress gz_physics5-install-pkg-jammy-amd64
install_ci fortress gz_physics5-install_bottle-homebrew-amd64
install_ci fortress gz_plugin1-install-pkg-focal-amd64
install_ci fortress gz_plugin1-install-pkg-jammy-amd64
install_ci fortress gz_plugin1-install_bottle-homebrew-amd64
install_ci fortress gz_rendering6-install-pkg-focal-amd64
install_ci fortress gz_rendering6-install-pkg-jammy-amd64
install_ci fortress gz_rendering6-install_bottle-homebrew-amd64
install_ci fortress gz_sensors6-install-pkg-focal-amd64
install_ci fortress gz_sensors6-install-pkg-jammy-amd64
install_ci fortress gz_sensors6-install_bottle-homebrew-amd64
install_ci fortress gz_sim6-install-pkg-focal-amd64
install_ci fortress gz_sim6-install-pkg-jammy-amd64
install_ci fortress gz_sim6-install_bottle-homebrew-amd64
install_ci fortress gz_tools1-install-pkg-focal-amd64
install_ci fortress gz_tools1-install-pkg-jammy-amd64
install_ci fortress gz_tools1-install_bottle-homebrew-amd64
install_ci fortress gz_transport11-install-pkg-focal-amd64
install_ci fortress gz_transport11-install-pkg-jammy-amd64
install_ci fortress gz_transport11-install_bottle-homebrew-amd64
install_ci fortress gz_utils1-install-pkg-focal-amd64
install_ci fortress gz_utils1-install-pkg-jammy-amd64
install_ci fortress gz_utils1-install_bottle-homebrew-amd64
install_ci fortress sdformat12-install-pkg-focal-amd64
install_ci fortress sdformat12-install-pkg-jammy-amd64
install_ci fortress sdformat12-install_bottle-homebrew-amd64
install_ci garden gz_cmake3-install-pkg-focal-amd64
install_ci garden gz_cmake3-install-pkg-jammy-amd64
install_ci garden gz_cmake3-install_bottle-homebrew-amd64
install_ci garden gz_common5-install-pkg-focal-amd64
install_ci garden gz_common5-install-pkg-jammy-amd64
install_ci garden gz_common5-install_bottle-homebrew-amd64
install_ci garden gz_fuel_tools8-install-pkg-focal-amd64
install_ci garden gz_fuel_tools8-install-pkg-jammy-amd64
install_ci garden gz_fuel_tools8-install_bottle-homebrew-amd64
install_ci garden gz_garden-install-pkg-focal-amd64
install_ci garden gz_garden-install-pkg-jammy-amd64
install_ci garden gz_garden-install_bottle-homebrew-amd64
install_ci garden gz_gui7-install-pkg-focal-amd64
install_ci garden gz_gui7-install-pkg-jammy-amd64
install_ci garden gz_gui7-install_bottle-homebrew-amd64
install_ci garden gz_launch6-install-pkg-focal-amd64
install_ci garden gz_launch6-install-pkg-jammy-amd64
install_ci garden gz_launch6-install_bottle-homebrew-amd64
install_ci garden gz_math7-install-pkg-focal-amd64
install_ci garden gz_math7-install-pkg-jammy-amd64
install_ci garden gz_math7-install_bottle-homebrew-amd64
install_ci garden gz_msgs9-install-pkg-focal-amd64
install_ci garden gz_msgs9-install-pkg-jammy-amd64
install_ci garden gz_msgs9-install_bottle-homebrew-amd64
install_ci garden gz_physics6-install-pkg-focal-amd64
install_ci garden gz_physics6-install-pkg-jammy-amd64
install_ci garden gz_physics6-install_bottle-homebrew-amd64
install_ci garden gz_plugin2-install-pkg-focal-amd64
install_ci garden gz_plugin2-install-pkg-jammy-amd64
install_ci garden gz_plugin2-install_bottle-homebrew-amd64
install_ci garden gz_rendering7-install-pkg-focal-amd64
install_ci garden gz_rendering7-install-pkg-jammy-amd64
install_ci garden gz_rendering7-install_bottle-homebrew-amd64
install_ci garden gz_sensors7-install-pkg-focal-amd64
install_ci garden gz_sensors7-install-pkg-jammy-amd64
install_ci garden gz_sensors7-install_bottle-homebrew-amd64
install_ci garden gz_sim7-install-pkg-focal-amd64
install_ci garden gz_sim7-install-pkg-jammy-amd64
install_ci garden gz_sim7-install_bottle-homebrew-amd64
install_ci garden gz_tools2-install-pkg-focal-amd64
install_ci garden gz_tools2-install-pkg-jammy-amd64
install_ci garden gz_tools2-install_bottle-homebrew-amd64
install_ci garden gz_transport12-install-pkg-focal-amd64
install_ci garden gz_transport12-install-pkg-jammy-amd64
install_ci garden gz_transport12-install_bottle-homebrew-amd64
install_ci garden gz_utils2-install-pkg-focal-amd64
install_ci garden gz_utils2-install-pkg-jammy-amd64
install_ci garden gz_utils2-install_bottle-homebrew-amd64
install_ci garden sdformat13-install-pkg-focal-amd64
install_ci garden sdformat13-install-pkg-jammy-amd64
install_ci garden sdformat13-install_bottle-homebrew-amd64
install_ci harmonic gz_cmake3-install-pkg-jammy-amd64
install_ci harmonic gz_cmake3-install_bottle-homebrew-amd64
Expand Down