From ea9bace5db845dd9afb6f90d810d5706bbda0329 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Thu, 16 Jan 2025 19:57:15 -0600 Subject: [PATCH 1/2] Bumps in jetty : ci_matching_branch/bump_jetty_gz-sim10 Signed-off-by: Addisu Z. Taddese --- .github/ci/packages.apt | 2 +- CMakeLists.txt | 4 ++-- docker/Dockerfile.nightly | 2 +- examples/plugin/rendering_plugins/CMakeLists.txt | 4 ++-- package.xml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index efde86b28b..2741e7a327 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -5,7 +5,7 @@ libglew-dev libgz-cmake4-dev libgz-common6-dev libgz-fuel-tools10-dev -libgz-gui9-dev +libgz-gui10-dev libgz-math8-eigen3-dev libgz-msgs11-dev libgz-physics8-dev diff --git a/CMakeLists.txt b/CMakeLists.txt index b23c9dc706..6ba16308f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -113,8 +113,8 @@ set(GZ_FUEL_TOOLS_VER ${gz-fuel_tools10_VERSION_MAJOR}) #-------------------------------------- # Find gz-gui -gz_find_package(gz-gui9 REQUIRED) -set(GZ_GUI_VER ${gz-gui9_VERSION_MAJOR}) +gz_find_package(gz-gui10 REQUIRED) +set(GZ_GUI_VER ${gz-gui10_VERSION_MAJOR}) gz_find_package (Qt5 COMPONENTS Core diff --git a/docker/Dockerfile.nightly b/docker/Dockerfile.nightly index 4dee43a1d5..96633e3b33 100644 --- a/docker/Dockerfile.nightly +++ b/docker/Dockerfile.nightly @@ -20,7 +20,7 @@ RUN apt-get update \ libgz-rendering9-dev \ libgz-tools2-dev \ libgz-transport14-dev \ - libgz-gui9-dev \ + libgz-gui10-dev \ libgz-msgs11-dev \ libgz-sensors9-dev \ libsdformat15-dev diff --git a/examples/plugin/rendering_plugins/CMakeLists.txt b/examples/plugin/rendering_plugins/CMakeLists.txt index fcb8fc2af1..16c453296f 100644 --- a/examples/plugin/rendering_plugins/CMakeLists.txt +++ b/examples/plugin/rendering_plugins/CMakeLists.txt @@ -14,7 +14,7 @@ set(GUI_PLUGIN RenderingGuiPlugin) set(CMAKE_AUTOMOC ON) -find_package(gz-gui9 REQUIRED) +find_package(gz-gui10 REQUIRED) QT5_ADD_RESOURCES(resources_RCC ${GUI_PLUGIN}.qrc) @@ -24,7 +24,7 @@ add_library(${GUI_PLUGIN} SHARED ) target_link_libraries(${GUI_PLUGIN} PRIVATE - gz-gui9::gz-gui9 + gz-gui10::gz-gui10 gz-rendering9::gz-rendering9 ) diff --git a/package.xml b/package.xml index 3382afcfc3..6d6bfa8ddb 100644 --- a/package.xml +++ b/package.xml @@ -15,7 +15,7 @@ gz-cmake4 gz-common6 gz-fuel_tools10 - gz-gui9 + gz-gui10 gz-math8 gz-msgs11 gz-physics8 From 066aca91b226eadcca6e8db488051ff658bd91be Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Fri, 17 Jan 2025 12:34:46 +0100 Subject: [PATCH 2/2] Remove Jammy CI in main branch Signed-off-by: Jose Luis Rivero --- .github/workflows/ci.yml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a011e2abda..b14559f4ba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,25 +15,6 @@ concurrency: cancel-in-progress: true jobs: - jammy-ci: - runs-on: ubuntu-latest - name: Ubuntu Jammy CI - steps: - - name: Checkout - uses: actions/checkout@v4 - - uses: actions/setup-python@v3 - - uses: pre-commit/action@v3.0.0 - with: - extra_args: --all-files - - name: Compile and test - id: ci - uses: gazebo-tooling/action-gz-ci@jammy - with: - # per bug /~https://github.com/gazebosim/gz-sim/issues/1409 - cmake-args: '-DCMAKE_INSTALL_PREFIX=/usr -DBUILD_DOCS=OFF' - codecov-enabled: true - cppcheck-enabled: true - cpplint-enabled: true noble-ci: runs-on: ubuntu-latest name: Ubuntu Noble CI