Skip to content

Commit

Permalink
Add CI for Ubuntu Noble (#467)
Browse files Browse the repository at this point in the history
  • Loading branch information
rjoomen authored Jul 18, 2024
1 parent d2563f7 commit 22354c6
Show file tree
Hide file tree
Showing 7 changed files with 57 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/code_quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
apt install -y clang-tidy libompl-dev taskflow
- name: Build and Tests
uses: tesseract-robotics/colcon-action@v2
uses: tesseract-robotics/colcon-action@v8
with:
before-script: source /opt/tesseract/install/setup.bash && source /opt/trajopt/install/setup.bash
ccache-prefix: ${{ matrix.job_type }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
strategy:
fail-fast: false
matrix:
distro: [focal, jammy]
distro: [focal, jammy, noble]
env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}
Expand Down
18 changes: 14 additions & 4 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
fail-fast: false
matrix:
distro: [focal, jammy]
distro: [focal, jammy, noble]
container:
image: ghcr.io/tesseract-robotics/trajopt:${{ matrix.distro }}
env:
Expand All @@ -35,12 +35,22 @@ jobs:
run: |
apt update
apt upgrade -y
apt install -y wget software-properties-common
apt install -y wget libompl-dev
- name: Install Depends (non-noble)
if: ${{ matrix.distro != 'noble' }}
shell: bash
run: |
apt install -y software-properties-common
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@v2
uses: tesseract-robotics/colcon-action@v8
with:
before-script: source /opt/tesseract/install/setup.bash && source /opt/trajopt/install/setup.bash
ccache-prefix: ${{ matrix.distro }}
Expand Down
18 changes: 14 additions & 4 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
strategy:
fail-fast: false
matrix:
distro: [focal, jammy]
distro: [focal, jammy, noble]
container:
image: ghcr.io/tesseract-robotics/trajopt:${{ matrix.distro }}-0.22
env:
Expand All @@ -41,12 +41,22 @@ jobs:
run: |
apt update
apt upgrade -y
apt install -y wget software-properties-common
apt install -y wget libompl-dev
- name: Install Depends (non-noble)
if: ${{ matrix.distro != 'noble' }}
shell: bash
run: |
apt install -y software-properties-common
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@v2
uses: tesseract-robotics/colcon-action@v8
with:
before-script: source /opt/tesseract/install/setup.bash && source /opt/trajopt/install/setup.bash
ccache-prefix: ${{ matrix.distro }}
Expand Down
28 changes: 19 additions & 9 deletions .github/workflows/unstable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -23,7 +23,7 @@ jobs:
strategy:
fail-fast: false
matrix:
distro: [focal, jammy]
distro: [focal, jammy, noble]
container:
image: ghcr.io/tesseract-robotics/trajopt:${{ matrix.distro }}-master
env:
Expand All @@ -41,12 +41,22 @@ jobs:
run: |
apt update
apt upgrade -y
apt install -y wget software-properties-common
apt install -y wget libompl-dev
- name: Install Depends (non-noble)
if: ${{ matrix.distro != 'noble' }}
shell: bash
run: |
apt install -y software-properties-common
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@v2
uses: tesseract-robotics/colcon-action@v8
with:
before-script: source /opt/tesseract/install/setup.bash && source /opt/trajopt/install/setup.bash
ccache-prefix: ${{ matrix.distro }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
echo "CMAKE_PREFIX_PATH=$GITHUB_WORKSPACE\vcpkg\installed\x64-windows-release" >> "$GITHUB_ENV"
- name: Build and Tests
uses: tesseract-robotics/colcon-action@v1
uses: tesseract-robotics/colcon-action@v8
with:
ccache-prefix: ${{ matrix.distro }}
vcs-file: .github/workflows/windows_dependencies.repos
Expand Down
9 changes: 7 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
ARG TAG
FROM ghcr.io/tesseract-robotics/trajopt:${TAG}
ENV E_TAG=$TAG

SHELL ["/bin/bash", "-c"]

Expand All @@ -8,10 +9,14 @@ ENV DEBIAN_FRONTEND noninteractive
USER root

# Install the dependency repositories
RUN apt install -y --no-install-recommends software-properties-common \
RUN if [[ $(lsb_release -cs) != noble ]] ; then \
apt install -y --no-install-recommends software-properties-common \
&& add-apt-repository -y ppa:levi-armstrong/tesseract-robotics \
&& apt update \
&& apt install -y libompl-dev taskflow
&& apt install -y libompl-dev taskflow \
; else \
apt install -y libompl-dev libtaskflow-cpp-dev \
; fi

# Bind mount the source directory so as not to unnecessarily copy source code into the docker image
ARG WORKSPACE_DIR=/opt/tesseract_planning
Expand Down

0 comments on commit 22354c6

Please sign in to comment.