Skip to content

Commit

Permalink
CI: add Ubuntu noble to build matrix
Browse files Browse the repository at this point in the history
  • Loading branch information
riebl committed Oct 21, 2024
1 parent f77f570 commit cad7ad5
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
ubuntu-version: [bionic, focal, jammy]
ubuntu-version: [bionic, focal, jammy, noble]
steps:
- uses: actions/checkout@v4
- run: >
Expand Down
4 changes: 2 additions & 2 deletions tools/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG UBUNTU_VERSION=xenial
FROM ubuntu:${UBUNTU_VERSION}
ARG DEBIAN_FRONTEND=noninteractive
SHELL ["/bin/bash", "-c"]
COPY update_cmake.sh /usr/local/bin/update_cmake.sh
COPY --chmod=755 update_cmake.sh apt_pkg_name.sh /usr/local/bin/
RUN update_cmake.sh && apt-get update && \
apt-get install -y --no-install-recommends \
build-essential \
Expand All @@ -12,7 +12,7 @@ RUN update_cmake.sh && apt-get update && \
libboost-program-options-dev \
libboost-system-dev \
libcrypto++-dev \
libgeographic-dev \
$(apt_pkg_name.sh geographiclib) \
libssl-dev \
ninja-build \
&& rm -rf /var/lib/apt/lists/*
Expand Down
30 changes: 30 additions & 0 deletions tools/docker/apt_pkg_name.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#!/bin/bash
set -euo pipefail

source /etc/os-release
case $VERSION_CODENAME in
bionic)
;&
focal)
;&
jammy)
GEOGRAPHICLIB=libgeographic-dev
;;
noble)
GEOGRAPHICLIB=libgeographiclib-dev
;;
*)
echo "Unsupported Ubuntu version: $VERSION_CODENAME"
exit 1
;;
esac

case $1 in
geographiclib)
echo $GEOGRAPHICLIB
;;
*)
echo "Unknown package name: $1"
exit 1
;;
esac

0 comments on commit cad7ad5

Please sign in to comment.