Skip to content

Commit

Permalink
CI: Build against Qt 6
Browse files Browse the repository at this point in the history
  • Loading branch information
rhaschke committed Feb 2, 2024
1 parent bae25ef commit cb73023
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
4 changes: 4 additions & 0 deletions .github/workflows/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ RUN --mount=type=bind,target=/tmp/rviz \
# Preferred build tools
clang clang-format-12 clang-tidy clang-tools ccache && \
#
if "$ROS_DISTRO" == "one"; then \
apt-get install --no-install-recommends -y qt6-base-dev qt6-base-dev-tools; \
fi && \
#
# Download all dependencies for rviz
rosdep update $(test "${ROS_DISTRO}" = "melodic" && echo "--include-eol-distros") && \
DEBIAN_FRONTEND=noninteractive \
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,30 @@ jobs:
matrix:
distro: [noetic, jammy]
ogre: ["1.9", "1.12"]
qt: [5]
include:
- distro: noetic
ogre: 1.9
env:
CLANG_TIDY: true
- distro: jammy
ogre: 1.12
qt: 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_INSTALL_TARGET_DEPENDENCIES: apt install -qq -y libogre-${{ matrix.ogre }}-dev
CATKIN_LINT: true
CMAKE_ARGS: -DRVIZ_QT_VERSIONS="${{ matrix.qt }}"
CCACHE_DIR: ${{ github.workspace }}/.ccache
BASEDIR: /home/runner/work
DOCKER_IMAGE: rhaschke/ici:rviz-${{ matrix.distro }}-ros
CACHE_PREFIX: ${{ matrix.distro }}
# perform full clang-tidy check only on manual trigger (workflow_dispatch), PRs do check changed files, otherwise nothing
CLANG_TIDY_BASE_REF: ${{ github.event_name != 'workflow_dispatch' && (github.base_ref || github.ref) || '' }}

name: "${{ matrix.distro }} • ogre ${{ matrix.ogre }}${{ matrix.env.CLANG_TIDY && (github.event_name != 'workflow_dispatch' && ' • clang-tidy (delta)' || ' • clang-tidy (all)') || '' }}"
name: "${{ matrix.distro }} • ogre ${{ matrix.ogre }} • Qt ${{ matrix.qt }}${{ matrix.env.CLANG_TIDY && (github.event_name != 'workflow_dispatch' && ' • clang-tidy (delta)' || ' • clang-tidy (all)') || '' }}"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down

0 comments on commit cb73023

Please sign in to comment.