Skip to content

Commit 9ab5574

Browse files
authored
Add Debian Bullseye to the install scripts, CI, docs. (#1897)
Signed-off-by: Wolfgang Hess <whess@fsfe.org>
1 parent 1173e80 commit 9ab5574

File tree

5 files changed

+56
-3
lines changed

5 files changed

+56
-3
lines changed

.github/workflows/ci-bullseye.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Debian Bullseye CI
2+
3+
on:
4+
push:
5+
branches: ["master"]
6+
pull_request:
7+
branches: ["master"]
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v3
14+
- name: Run the Dockerfile
15+
run: docker build . -f Dockerfile.bullseye

Dockerfile.bullseye

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Copyright 2022 The Cartographer Authors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
FROM debian:bullseye
16+
17+
ARG cc
18+
ARG cxx
19+
20+
# Set the preferred C/C++ compiler toolchain, if given (otherwise default).
21+
ENV CC=$cc
22+
ENV CXX=$cxx
23+
24+
# This base image doesn't ship with sudo.
25+
RUN apt-get update && apt-get install -y sudo && rm -rf /var/lib/apt/lists/*
26+
27+
COPY scripts/install_debs_cmake.sh cartographer/scripts/
28+
RUN cartographer/scripts/install_debs_cmake.sh && rm -rf /var/lib/apt/lists/*
29+
COPY . cartographer
30+
RUN cartographer/scripts/install_cartographer_cmake.sh && rm -rf cartographer

README.rst

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
Cartographer
1717
============
1818

19-
|build-jammy| |build-focal| |build-bionic| |docs| |license|
19+
|build-jammy| |build-focal| |build-bionic| |build-bullseye| |build-buster| |docs| |license|
2020

2121
Purpose
2222
=======
@@ -95,6 +95,14 @@ Slides of these Cartographer Open House meetings are listed below.
9595
:alt: Ubuntu 18.04 Build Status
9696
:scale: 100%
9797
:target: https://github.com/cartographer-project/cartographer/actions/workflows/ci-bionic.yaml
98+
.. |build-bullseye| image:: https://github.com/cartographer-project/cartographer/actions/workflows/ci-bullseye.yaml/badge.svg
99+
:alt: Debian Bullseye Build Status
100+
:scale: 100%
101+
:target: https://github.com/cartographer-project/cartographer/actions/workflows/ci-bullseye.yaml
102+
.. |build-buster| image:: https://github.com/cartographer-project/cartographer/actions/workflows/ci-buster.yaml/badge.svg
103+
:alt: Debian Buster Build Status
104+
:scale: 100%
105+
:target: https://github.com/cartographer-project/cartographer/actions/workflows/ci-buster.yaml
98106
.. |docs| image:: https://readthedocs.org/projects/google-cartographer/badge/?version=latest
99107
:alt: Documentation Status
100108
:scale: 100%

docs/source/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ on systems that meet the following requirements:
9494
* 64-bit, modern CPU (e.g. 3rd generation i7)
9595
* 16 GB RAM
9696
* Ubuntu 18.04 (Bionic), 20.04 (Focal), 22.04 (Jammy)
97-
* gcc version 7.5.0, 9.3.0, 11.2.0
97+
* gcc version 7.5.0, 8.3.0, 9.3.0, 10.2.1, 11.2.0
9898

9999
Known Issues
100100
------------

scripts/install_debs_cmake.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ sudo apt-get install -y \
4242
# Install Protocol Buffers and Abseil if available.
4343
# No need to build it ourselves.
4444
case "$(lsb_release -sc)" in
45-
jammy)
45+
jammy|bullseye)
4646
sudo apt-get install -y libgmock-dev protobuf-compiler libabsl-dev ;;
4747
focal|buster)
4848
sudo apt-get install -y libgmock-dev protobuf-compiler ;;

0 commit comments

Comments
 (0)