From 1ecdd40f0a2172abe5d75f57a9ca99d2b9d23323 Mon Sep 17 00:00:00 2001 From: Robert Haschke Date: Thu, 25 May 2023 22:44:36 +0200 Subject: [PATCH] GHA: Add Ogre 13.6 (#1) * GHA: Add Ogre 13.6 --- .github/workflows/ci.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b649be74f..f633abfde 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -14,16 +14,20 @@ jobs: fail-fast: false matrix: distro: [noetic, jammy] - ogre: ["1.9", "1.12"] + ogre: ["1.9", "1.12", "13.6"] include: - distro: noetic ogre: 1.9 env: CLANG_TIDY: true + exclude: + - distro: jammy + ogre: "13.6" env: CXXFLAGS: "-DRVIZ_DEPRECATE_QT4_SLOTS -Werror -Wall -Wextra -Wwrite-strings -Wunreachable-code -Wpointer-arith -Wredundant-decls -Wno-strict-aliasing -Wno-sign-compare" UPSTREAM_WORKSPACE: ${{ matrix.distro != 'jammy' && 'github:rhaschke/python_qt_binding#silent-external-warnings' || '' }} + AFTER_INIT: ${{ startsWith(matrix.ogre, '13') && 'apt install -q -y software-properties-common && add-apt-repository ppa:s-schmeisser/ogre-13-${{ matrix.distro }} -y' || ''}} AFTER_INSTALL_TARGET_DEPENDENCIES: apt install -qq -y libogre-${{ matrix.ogre }}-dev CATKIN_LINT: true CCACHE_DIR: ${{ github.workspace }}/.ccache