Use system taskflow for Noble

tesseract-robotics · Jul 18, 2024 · 67e9bef · 67e9bef
1 parent d224550
commit 67e9bef
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 11 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -35,9 +35,18 @@ jobs:
         run: |
           apt update
           apt upgrade -y
-          apt install -y wget software-properties-common
+          apt install -y wget software-properties-common libompl-dev
+      - name: Install Depends (non-noble)
+        if: ${{ matrix.distro != 'noble' }}
+        shell: bash
+        run: |
           add-apt-repository ppa:levi-armstrong/tesseract-robotics
-          apt install -y libompl-dev taskflow
+          apt install -y taskflow
+      - name: Install Depends (noble)
+        if: ${{ matrix.distro  == 'noble' }}
+        shell: bash
+        run: |
+          apt install -y libtaskflow-cpp-dev
 
       - name: Build and Tests
         uses: tesseract-robotics/colcon-action@v8

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -41,9 +41,18 @@ jobs:
         run: |
           apt update
           apt upgrade -y
-          apt install -y wget software-properties-common
+          apt install -y wget software-properties-common libompl-dev
+      - name: Install Depends (non-noble)
+        if: ${{ matrix.distro != 'noble' }}
+        shell: bash
+        run: |
           add-apt-repository ppa:levi-armstrong/tesseract-robotics
-          apt install -y libompl-dev taskflow
+          apt install -y taskflow
+      - name: Install Depends (noble)
+        if: ${{ matrix.distro  == 'noble' }}
+        shell: bash
+        run: |
+          apt install -y libtaskflow-cpp-dev
 
       - name: Build and Tests
         uses: tesseract-robotics/colcon-action@v8

diff --git a/.github/workflows/unstable.yml b/.github/workflows/unstable.yml
@@ -4,14 +4,14 @@ on:
   push:
     branches:
       - master
-      - 'dev**'
+      - "dev**"
   pull_request:
     paths:
-      - 'tesseract**'
-      - '.github/workflows/unstable.yml'
-      - '**.repos'
+      - "tesseract**"
+      - ".github/workflows/unstable.yml"
+      - "**.repos"
   schedule:
-    - cron: '0 5 * * *'
+    - cron: "0 5 * * *"
   release:
     types:
       - released
@@ -41,9 +41,18 @@ jobs:
         run: |
           apt update
           apt upgrade -y
-          apt install -y wget software-properties-common
+          apt install -y wget software-properties-common libompl-dev
+      - name: Install Depends (non-noble)
+        if: ${{ matrix.distro != 'noble' }}
+        shell: bash
+        run: |
           add-apt-repository ppa:levi-armstrong/tesseract-robotics
-          apt install -y libompl-dev taskflow
+          apt install -y taskflow
+      - name: Install Depends (noble)
+        if: ${{ matrix.distro  == 'noble' }}
+        shell: bash
+        run: |
+          apt install -y libtaskflow-cpp-dev
 
       - name: Build and Tests
         uses: tesseract-robotics/colcon-action@v8