Use system qt-advanced-docking-system for Noble

tesseract-robotics · Jul 23, 2024 · 3be15c2 · 3be15c2
1 parent da90fb0
commit 3be15c2
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git 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
@@ -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