Skip to content

Commit bbf18e3

Browse files
mgornydnicolodi
authored andcommitted
CI: add cmake and g++ to Cirrus CI Linux container images
Tests requiring cmake and a C++ compiler have been recently added. These tests also require a Meson version that was not yet released at the time they were added and thus were skipped in most CI jobs, thus the missing test dependencies were not noticed. Add them now that the required Meson version has been released.
1 parent 237eca4 commit bbf18e3

File tree

8 files changed

+16
-16
lines changed

8 files changed

+16
-16
lines changed

ci/alpine-3.docker

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
#
33
# SPDX-License-Identifier: MIT
44

5-
# 20250212
5+
# 20260108
66
FROM alpine:3
7-
RUN apk add --no-cache python3-dev py3-pip build-base ninja-is-really-ninja git patchelf
7+
RUN apk add --no-cache python3-dev py3-pip build-base ninja-is-really-ninja git patchelf cmake

ci/archlinux.docker

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
#
33
# SPDX-License-Identifier: MIT
44

5-
# 20250127
5+
# 20260108
66
FROM archlinux:latest
7-
RUN pacman -Syu --noconfirm && pacman -S --noconfirm python python-pip gcc ninja git patchelf
7+
RUN pacman -Syu --noconfirm && pacman -S --noconfirm python python-pip gcc ninja git patchelf cmake

ci/debian-11.docker

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
#
33
# SPDX-License-Identifier: MIT
44

5-
# 20250212
5+
# 20260108
66
FROM debian:bullseye
7-
RUN apt-get update && apt-get install -y git ninja-build patchelf python3-pip python3-venv && rm -rf /var/lib/apt/lists/*
7+
RUN apt-get update && apt-get install -y git ninja-build patchelf python3-pip python3-venv cmake && rm -rf /var/lib/apt/lists/*

ci/debian-12.docker

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
#
33
# SPDX-License-Identifier: MIT
44

5-
# 20250127
5+
# 20260108
66
FROM debian:bookworm
7-
RUN apt-get update && apt-get install -y git ninja-build patchelf python3-pip python3-venv && rm -rf /var/lib/apt/lists/*
7+
RUN apt-get update && apt-get install -y git ninja-build patchelf python3-pip python3-venv cmake && rm -rf /var/lib/apt/lists/*

ci/debian-unstable.docker

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
#
33
# SPDX-License-Identifier: MIT
44

5-
# 20230816
5+
# 20260108
66
FROM debian:unstable
7-
RUN apt-get update && apt-get install -y git ninja-build patchelf python3-pip python3-venv && rm -rf /var/lib/apt/lists/*
7+
RUN apt-get update && apt-get install -y gcc g++ git ninja-build patchelf python3-pip python3-venv cmake && rm -rf /var/lib/apt/lists/*

ci/fedora-41.docker

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
#
33
# SPDX-License-Identifier: MIT
44

5-
# 20250127
5+
# 20260108
66
FROM fedora:41
7-
RUN dnf -y update && dnf -y install python3-devel python3-pip gcc ninja-build git patchelf && dnf clean all
7+
RUN dnf -y update && dnf -y install python3-devel python3-pip gcc gcc-c++ ninja-build git patchelf cmake && dnf clean all

ci/miniconda.docker

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
#
33
# SPDX-License-Identifier: MIT
44

5-
# 20240204
5+
# 20260108
66
FROM continuumio/miniconda3
7-
RUN apt-get update && apt-get install -y gcc ninja-build git patchelf && rm -rf /var/lib/apt/lists/*
7+
RUN apt-get update && apt-get install -y gcc g++ ninja-build git patchelf cmake && rm -rf /var/lib/apt/lists/*

ci/opensuse-15.docker

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
#
33
# SPDX-License-Identifier: MIT
44

5-
# 20240817
5+
# 20260108
66
FROM opensuse/leap:latest
7-
RUN zypper --non-interactive install python311 python311-pip python311-devel gcc ninja git patchelf && zypper clean --all && ln -sf python3.11 /usr/bin/python3
7+
RUN zypper --non-interactive install python311 python311-pip python311-devel gcc gcc-c++ ninja git patchelf cmake && zypper clean --all && ln -sf python3.11 /usr/bin/python3

0 commit comments

Comments
 (0)