From 5037fe9eed5ff695f50052894217e3d1ea588503 Mon Sep 17 00:00:00 2001 From: Daniele Nicolodi Date: Sun, 4 Feb 2024 23:04:32 +0100 Subject: [PATCH 1/2] CI: extend matrix to include Meson 1.2 The tests are run with the latest Meson version, and Meson 1.3 has been released a while ago. Add Meson 1.2 to the old releases with test with. Pin the version to 1.2.3 or later, to be able to run on Python 3.12. --- .github/workflows/tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d3bcf432f..9bfb343ee 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -75,6 +75,9 @@ jobs: - os: ubuntu python: '3.11' meson: '~=1.1.0' + - os: ubuntu + python: '3.12' + meson: '~=1.2.3' # Test with Meson master branch. - os: ubuntu python: '3.12' From f3441d79e433aefe5db82dc4059a6aad6674bce4 Mon Sep 17 00:00:00 2001 From: Daniele Nicolodi Date: Sun, 4 Feb 2024 23:45:38 +0100 Subject: [PATCH 2/2] CI: update cirrus-ci images And hopefully get the CI jobs unstuck. --- ci/alpine-3.docker | 2 +- ci/debian-11.docker | 2 +- ci/debian-12.docker | 2 +- ci/fedora-37.docker | 2 +- ci/miniconda.docker | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/alpine-3.docker b/ci/alpine-3.docker index d29912369..2fe4f31b3 100644 --- a/ci/alpine-3.docker +++ b/ci/alpine-3.docker @@ -2,6 +2,6 @@ # # SPDX-License-Identifier: MIT -# 20221203 +# 20240204 FROM alpine:3 RUN apk add --no-cache python3-dev py3-pip build-base ninja git patchelf diff --git a/ci/debian-11.docker b/ci/debian-11.docker index 6b7685a6e..5777afe83 100644 --- a/ci/debian-11.docker +++ b/ci/debian-11.docker @@ -2,6 +2,6 @@ # # SPDX-License-Identifier: MIT -# 20221203 +# 20240204 FROM debian:bullseye RUN apt-get update && apt-get install -y git ninja-build patchelf python3-pip python3-venv && rm -rf /var/lib/apt/lists/* diff --git a/ci/debian-12.docker b/ci/debian-12.docker index 0450bfe86..928aa77a4 100644 --- a/ci/debian-12.docker +++ b/ci/debian-12.docker @@ -2,6 +2,6 @@ # # SPDX-License-Identifier: MIT -# 20230816 +# 20240204 FROM debian:bookworm RUN apt-get update && apt-get install -y git ninja-build patchelf python3-pip python3-venv && rm -rf /var/lib/apt/lists/* diff --git a/ci/fedora-37.docker b/ci/fedora-37.docker index 320e5ff8e..efd07dbf3 100644 --- a/ci/fedora-37.docker +++ b/ci/fedora-37.docker @@ -2,6 +2,6 @@ # # SPDX-License-Identifier: MIT -# 20221203 +# 20240204 FROM fedora:37 RUN dnf -y update && dnf -y install python3-devel python3-pip gcc ninja-build git patchelf && dnf clean all diff --git a/ci/miniconda.docker b/ci/miniconda.docker index 6913ae5a0..3f90b5b6a 100644 --- a/ci/miniconda.docker +++ b/ci/miniconda.docker @@ -2,6 +2,6 @@ # # SPDX-License-Identifier: MIT -# 20221203 +# 20240204 FROM continuumio/miniconda3 RUN apt-get update && apt-get install -y gcc ninja-build git patchelf && rm -rf /var/lib/apt/lists/*