Skip to content

Commit

Permalink
Merge branch 'master' into jrivero/cleanup_gzdev
Browse files Browse the repository at this point in the history
  • Loading branch information
j-rivero authored Nov 18, 2024
2 parents bf459e3 + 30a03b5 commit fc67ab4
Show file tree
Hide file tree
Showing 11 changed files with 13,591 additions and 31 deletions.
22 changes: 22 additions & 0 deletions .github/workflows/ci-pixi.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Conda env testing

on:
push:
paths:
- 'conda/envs/legacy/**'

jobs:
legacy_pixi_test:
runs-on: ubuntu-latest
name: Legacy Pixi
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Install pixi
uses: prefix-dev/setup-pixi@ba3bb36eb2066252b2363392b7739741bb777659 # v0.8.1
with:
locked: true
cache: false # 10Gb limit might be too low for caching
manifest-path: conda/envs/legacy/pixi.toml
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Gazebo software.

For the developers officially maintaining Gazebo software that need to run a new release of the software:

* The [Gazebo Release Process](https://gazebosim.org/docs/garden/release)
* The [Gazebo Release Process](https://gazebosim.org/docs/latest/release)
document provides an overview of how releasing works.
* The [Gazebo Release Instructions](https://gazebosim.org/docs/garden/releases-instructions)
* The [Gazebo Release Instructions](https://gazebosim.org/docs/latest/releases-instructions)
document provides step by step instructions to run new releases.
37 changes: 37 additions & 0 deletions conda/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Conda configurations and tools for Gazebo

This repository hosts the Conda related configurations and files used
by the Gazebo project.

> [!IMPORTANT]
> Currently the Gazebo project is only using Conda for supporting the
> build on Windows. The builds or Conda packages can perfectly work
> on different platforms but the core team is not actively testing
> them.
## The envs/ (environments) directory

The environments directory hosts the Conda environments and Pixi projects
configurations used for different combinations of Gazebo distributions.

## Create environments with Pixi

[Pixi](https://prefix.dev/) can be used to recreate a Gazebo development
environment. Navigate to the right subdirectory under `envs/` where the
`pixi.lock` and `pixi.toml` files are located and run:

```bash
pixi install --locked
```

## Environments available

### The legacy environment

The legacy environment has the goal of replacing the previous vcpkg
installation used by the Gazebo Buildfarm for testing Garden, Harmonic
and Ionic. The software versions chosen are mostly based on the Ubuntu
Jammy versions.

The legacy enviroment is locked to use always the same exact set of
version dependencies.
13,236 changes: 13,236 additions & 0 deletions conda/envs/legacy/pixi.lock

Large diffs are not rendered by default.

60 changes: 60 additions & 0 deletions conda/envs/legacy/pixi.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
[project]
name = "gazebo"
version = "0.1.0"
description = "Pixi configuration to replicate existing Windows build environment in Gazebo"
authors = ["Jose Luis Rivero <[email protected]>"]
channels = ["conda-forge"]
platforms = ["linux-64", "linux-aarch64", "win-64"]

[dependencies]
assimp = "*"
bullet-cpp = "*"
cppzmq = "*"
curl = "*"
dartsim = "6.13.2.*"
eigen = "*"
ffmpeg = "*"
freeimage = "*"
gdal = "*"
gflags = "*"
glib = "*"
gts = "*"
jsoncpp = "*"
libprotobuf = "*"
libsqlite = "*"
libzip = "*"
ogre = "1.10.12.1.*"
ogre-next = "2.2.*"
openssl = "*"
protobuf = "*"
pybind11 = "*"
python = "3.9.*"
qt-main = "*"
qwt = "*"
ruby = "3.2.*"
tinyxml2 = "*"
yaml = "*"
zeromq = "*"

[target.win-64.dependencies]
dlfcn-win32 = "*"

[target.linux-64.dependencies]
libglu = "*"
libglvnd-devel-cos7-x86_64 = "*"
libwebsockets = "*"
mesa-libegl-devel-cos7-x86_64 = "*"
mesa-libgl-devel-cos7-x86_64 = "*"
vulkan-headers = "*"

[target.linux-aarch64.dependencies]
libglu = "*"
libglvnd-devel-cos7-aarch64 = "*"
mesa-libegl-devel-cos7-aarch64 = "*"
mesa-libgl-devel-cos7-aarch64 = "*"

[build-dependencies]
cmake = "3.28.3.*"
colcon-common-extensions = "*"
pkg-config = "*"
vcstool = "*"
85 changes: 85 additions & 0 deletions jenkins-scripts/dsl/gz-collections.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,88 @@ collections:
linux:
ignore_major_version:
- gz-ionic
- name: 'jetty'
libs:
- name: gz-cmake
major_version: 4
repo:
current_branch: gz-cmake4
- name: gz-tools
major_version: 2
repo:
current_branch: gz-tools2
- name: gz-utils
major_version: 3
repo:
current_branch: gz-utils3
- name: gz-math
major_version: 8
repo:
current_branch: gz-math8
- name: gz-plugin
major_version: 3
repo:
current_branch: gz-plugin3
- name: gz-common
major_version: 6
repo:
current_branch: gz-common6
- name: gz-msgs
major_version: 11
repo:
current_branch: gz-msgs11
- name: gz-rendering
major_version: 9
repo:
current_branch: gz-rendering9
- name: sdformat
major_version: 15
repo:
current_branch: sdf15
- name: gz-fuel-tools
major_version: 10
repo:
current_branch: gz-fuel-tools10
- name: gz-transport
major_version: 14
repo:
current_branch: gz-transport14
- name: gz-gui
major_version: 9
repo:
current_branch: gz-gui9
- name: gz-sensors
major_version: 9
repo:
current_branch: gz-sensors9
- name: gz-physics
major_version: 8
repo:
current_branch: gz-physics8
- name: gz-sim
major_version: 9
repo:
current_branch: gz-sim9
- name: gz-launch
major_version: 8
repo:
current_branch: gz-launch8
- name: gz-jetty
major_version: 1
repo:
current_branch: main
ci:
configs:
- noble
- brew
- win
packaging:
configs:
- noble
- brew
linux:
ignore_major_version:
- gz-ionic
- name: '__upcoming__'
libs:
- name: gz-tools
Expand Down Expand Up @@ -632,6 +714,7 @@ ci_configs:
all:
- gz-harmonic
- gz-ionic
- gz-jetty
- __upcoming__
abichecker:
- gz-cmake
Expand Down Expand Up @@ -686,6 +769,7 @@ ci_configs:
- gz-garden
- gz-harmonic
- gz-ionic
- gz-jetty
- __upcoming__
cmake_warnings_disabled:
- gz-cmake
Expand Down Expand Up @@ -719,6 +803,7 @@ ci_configs:
- gz-garden
- gz-harmonic
- gz-ionic
- gz-jetty
- __upcoming__
cmake_warnings_disabled:
- gz-cmake
Expand Down
98 changes: 98 additions & 0 deletions jenkins-scripts/dsl/logs/generated_jobs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,22 @@ asan_ci ionic gz_tools-ci_asan-gz-tools2-noble-amd64
asan_ci ionic gz_transport-ci_asan-gz-transport14-noble-amd64
asan_ci ionic gz_utils-ci_asan-gz-utils3-noble-amd64
asan_ci ionic sdformat-ci_asan-sdf15-noble-amd64
asan_ci jetty gz_cmake-ci_asan-gz-cmake4-noble-amd64
asan_ci jetty gz_common-ci_asan-gz-common6-noble-amd64
asan_ci jetty gz_fuel_tools-ci_asan-gz-fuel-tools10-noble-amd64
asan_ci jetty gz_gui-ci_asan-gz-gui9-noble-amd64
asan_ci jetty gz_launch-ci_asan-gz-launch8-noble-amd64
asan_ci jetty gz_math-ci_asan-gz-math8-noble-amd64
asan_ci jetty gz_msgs-ci_asan-gz-msgs11-noble-amd64
asan_ci jetty gz_physics-ci_asan-gz-physics8-noble-amd64
asan_ci jetty gz_plugin-ci_asan-gz-plugin3-noble-amd64
asan_ci jetty gz_rendering-ci_asan-gz-rendering9-noble-amd64
asan_ci jetty gz_sensors-ci_asan-gz-sensors9-noble-amd64
asan_ci jetty gz_sim-ci_asan-gz-sim9-noble-amd64
asan_ci jetty gz_tools-ci_asan-gz-tools2-noble-amd64
asan_ci jetty gz_transport-ci_asan-gz-transport14-noble-amd64
asan_ci jetty gz_utils-ci_asan-gz-utils3-noble-amd64
asan_ci jetty sdformat-ci_asan-sdf15-noble-amd64
branch_ci __upcoming__ gz_cmake-ci-main-homebrew-amd64
branch_ci __upcoming__ gz_cmake-ci-main-noble-amd64
branch_ci __upcoming__ gz_cmake-main-win
Expand Down Expand Up @@ -392,6 +408,54 @@ branch_ci ionic gz_utils-ci-gz-utils3-noble-amd64
branch_ci ionic sdformat-ci-sdf15-homebrew-amd64
branch_ci ionic sdformat-ci-sdf15-noble-amd64
branch_ci ionic sdformat-sdf15-win
branch_ci jetty gz_cmake-4-win
branch_ci jetty gz_cmake-ci-gz-cmake4-homebrew-amd64
branch_ci jetty gz_cmake-ci-gz-cmake4-noble-amd64
branch_ci jetty gz_common-6-win
branch_ci jetty gz_common-ci-gz-common6-homebrew-amd64
branch_ci jetty gz_common-ci-gz-common6-noble-amd64
branch_ci jetty gz_fuel_tools-10-win
branch_ci jetty gz_fuel_tools-ci-gz-fuel-tools10-homebrew-amd64
branch_ci jetty gz_fuel_tools-ci-gz-fuel-tools10-noble-amd64
branch_ci jetty gz_gui-9-win
branch_ci jetty gz_gui-ci-gz-gui9-homebrew-amd64
branch_ci jetty gz_gui-ci-gz-gui9-noble-amd64
branch_ci jetty gz_launch-8-win
branch_ci jetty gz_launch-ci-gz-launch8-homebrew-amd64
branch_ci jetty gz_launch-ci-gz-launch8-noble-amd64
branch_ci jetty gz_math-8-win
branch_ci jetty gz_math-ci-gz-math8-homebrew-amd64
branch_ci jetty gz_math-ci-gz-math8-noble-amd64
branch_ci jetty gz_msgs-11-win
branch_ci jetty gz_msgs-ci-gz-msgs11-homebrew-amd64
branch_ci jetty gz_msgs-ci-gz-msgs11-noble-amd64
branch_ci jetty gz_physics-8-win
branch_ci jetty gz_physics-ci-gz-physics8-homebrew-amd64
branch_ci jetty gz_physics-ci-gz-physics8-noble-amd64
branch_ci jetty gz_plugin-3-win
branch_ci jetty gz_plugin-ci-gz-plugin3-homebrew-amd64
branch_ci jetty gz_plugin-ci-gz-plugin3-noble-amd64
branch_ci jetty gz_rendering-9-win
branch_ci jetty gz_rendering-ci-gz-rendering9-homebrew-amd64
branch_ci jetty gz_rendering-ci-gz-rendering9-noble-amd64
branch_ci jetty gz_sensors-9-win
branch_ci jetty gz_sensors-ci-gz-sensors9-homebrew-amd64
branch_ci jetty gz_sensors-ci-gz-sensors9-noble-amd64
branch_ci jetty gz_sim-9-win
branch_ci jetty gz_sim-ci-gz-sim9-homebrew-amd64
branch_ci jetty gz_sim-ci-gz-sim9-noble-amd64
branch_ci jetty gz_tools-2-win
branch_ci jetty gz_tools-ci-gz-tools2-homebrew-amd64
branch_ci jetty gz_tools-ci-gz-tools2-noble-amd64
branch_ci jetty gz_transport-14-win
branch_ci jetty gz_transport-ci-gz-transport14-homebrew-amd64
branch_ci jetty gz_transport-ci-gz-transport14-noble-amd64
branch_ci jetty gz_utils-3-win
branch_ci jetty gz_utils-ci-gz-utils3-homebrew-amd64
branch_ci jetty gz_utils-ci-gz-utils3-noble-amd64
branch_ci jetty sdformat-ci-sdf15-homebrew-amd64
branch_ci jetty sdformat-ci-sdf15-noble-amd64
branch_ci jetty sdformat-sdf15-win
install_ci __upcoming__ gz_cmake5-install-pkg-noble-amd64
install_ci __upcoming__ gz_cmake5-install_bottle-homebrew-amd64
install_ci __upcoming__ gz_common7-install-pkg-noble-amd64
Expand Down Expand Up @@ -643,6 +707,40 @@ install_ci ionic gz_utils3-install-pkg-noble-amd64
install_ci ionic gz_utils3-install_bottle-homebrew-amd64
install_ci ionic sdformat15-install-pkg-noble-amd64
install_ci ionic sdformat15-install_bottle-homebrew-amd64
install_ci jetty gz_cmake4-install-pkg-noble-amd64
install_ci jetty gz_cmake4-install_bottle-homebrew-amd64
install_ci jetty gz_common6-install-pkg-noble-amd64
install_ci jetty gz_common6-install_bottle-homebrew-amd64
install_ci jetty gz_fuel_tools10-install-pkg-noble-amd64
install_ci jetty gz_fuel_tools10-install_bottle-homebrew-amd64
install_ci jetty gz_gui9-install-pkg-noble-amd64
install_ci jetty gz_gui9-install_bottle-homebrew-amd64
install_ci jetty gz_jetty1-install-pkg-noble-amd64
install_ci jetty gz_jetty1-install_bottle-homebrew-amd64
install_ci jetty gz_launch8-install-pkg-noble-amd64
install_ci jetty gz_launch8-install_bottle-homebrew-amd64
install_ci jetty gz_math8-install-pkg-noble-amd64
install_ci jetty gz_math8-install_bottle-homebrew-amd64
install_ci jetty gz_msgs11-install-pkg-noble-amd64
install_ci jetty gz_msgs11-install_bottle-homebrew-amd64
install_ci jetty gz_physics8-install-pkg-noble-amd64
install_ci jetty gz_physics8-install_bottle-homebrew-amd64
install_ci jetty gz_plugin3-install-pkg-noble-amd64
install_ci jetty gz_plugin3-install_bottle-homebrew-amd64
install_ci jetty gz_rendering9-install-pkg-noble-amd64
install_ci jetty gz_rendering9-install_bottle-homebrew-amd64
install_ci jetty gz_sensors9-install-pkg-noble-amd64
install_ci jetty gz_sensors9-install_bottle-homebrew-amd64
install_ci jetty gz_sim9-install-pkg-noble-amd64
install_ci jetty gz_sim9-install_bottle-homebrew-amd64
install_ci jetty gz_tools2-install-pkg-noble-amd64
install_ci jetty gz_tools2-install_bottle-homebrew-amd64
install_ci jetty gz_transport14-install-pkg-noble-amd64
install_ci jetty gz_transport14-install_bottle-homebrew-amd64
install_ci jetty gz_utils3-install-pkg-noble-amd64
install_ci jetty gz_utils3-install_bottle-homebrew-amd64
install_ci jetty sdformat15-install-pkg-noble-amd64
install_ci jetty sdformat15-install_bottle-homebrew-amd64
unofficial_wrappers_install_pkg_ci garden ros_gzgarden_bridge-install-pkg_humble-ci-jammy-amd64
unofficial_wrappers_install_pkg_ci garden ros_gzgarden_bridge-install-pkg_iron-ci-jammy-amd64
unofficial_wrappers_install_pkg_ci harmonic ros_gzharmonic_bridge-install-pkg_humble-ci-jammy-amd64
Expand Down
Loading

0 comments on commit fc67ab4

Please sign in to comment.