From 3be15c23da13c7b8d613ca48868c46457538de47 Mon Sep 17 00:00:00 2001 From: Roelof Oomen Date: Thu, 18 Jul 2024 08:37:48 +0200 Subject: [PATCH] Use system qt-advanced-docking-system for Noble --- .github/workflows/ubuntu.yml | 12 +++++++++++- .github/workflows/unstable.yml | 12 +++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 1685241..e318816 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -35,10 +35,20 @@ jobs: run: | apt update apt upgrade -y - apt install -y wget qt-advanced-docking-system + apt install -y wget cd $GITHUB_WORKSPACE/target_ws/src ./.add-gazebo-ppa apt install -y libgz-rendering7-dev libgz-common5-dev libgz-math7-dev + - name: Install Depends (non-noble) + if: ${{ matrix.distro != 'noble' }} + shell: bash + run: | + apt install -y qt-advanced-docking-system + - name: Install Depends (noble) + if: ${{ matrix.distro == 'noble' }} + shell: bash + run: | + apt install -y libqt-advanced-docking-system-dev - name: Build and Tests uses: tesseract-robotics/colcon-action@v8 diff --git a/.github/workflows/unstable.yml b/.github/workflows/unstable.yml index 6bd854a..965e428 100644 --- a/.github/workflows/unstable.yml +++ b/.github/workflows/unstable.yml @@ -35,10 +35,20 @@ jobs: run: | apt update apt upgrade -y - apt install -y wget qt-advanced-docking-system + apt install -y wget cd $GITHUB_WORKSPACE/target_ws/src ./.add-gazebo-ppa apt install -y libgz-rendering7-dev libgz-common5-dev libgz-math7-dev + - name: Install Depends (non-noble) + if: ${{ matrix.distro != 'noble' }} + shell: bash + run: | + apt install -y qt-advanced-docking-system + - name: Install Depends (noble) + if: ${{ matrix.distro == 'noble' }} + shell: bash + run: | + apt install -y libqt-advanced-docking-system-dev - name: Build and Tests uses: tesseract-robotics/colcon-action@v8