From decfe768074746beff41e9d761c053e7fd3bf6c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20M=C3=A4rdian?= Date: Mon, 25 Mar 2024 13:57:35 +0100 Subject: [PATCH 1/3] meson: Build using Python 3.10 limited API (LP: #2050881) This requires meson >= 1.3.0 --- meson.build | 2 +- python-cffi/netplan/meson.build | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 1f8789932..41879a7f3 100644 --- a/meson.build +++ b/meson.build @@ -6,7 +6,7 @@ project('netplan', 'c', 'warning_level=2', 'werror=true', ], - meson_version: '>= 0.61.0', + meson_version: '>= 1.3.0', ) glib = dependency('glib-2.0') diff --git a/python-cffi/netplan/meson.build b/python-cffi/netplan/meson.build index 2f820d132..17b661405 100644 --- a/python-cffi/netplan/meson.build +++ b/python-cffi/netplan/meson.build @@ -24,6 +24,7 @@ cffi_pyext = python.extension_module( link_with: [libnetplan], subdir: 'netplan', install: true, + limited_api: '3.10', ) bindings_sources = [ From 899a47549e6cf84c8ece4d6a715a1045b4c4d295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20M=C3=A4rdian?= Date: Thu, 28 Mar 2024 17:33:42 +0100 Subject: [PATCH 2/3] CI: fix codeql build --- .github/workflows/codeql-analysis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index cac50f194..3168ccff9 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -58,6 +58,7 @@ jobs: # Installs the build dependencies - name: Install build depends run: | + echo "APT::Get::Always-Include-Phased-Updates \"true\";" | sudo tee /etc/apt/apt.conf.d/90phased-updates sudo sed -i 's/Types: deb/Types: deb deb-src/g' /etc/apt/sources.list.d/ubuntu.sources sudo apt update sudo apt install meson python3-coverage python3-pytest python3-pytest-cov libcmocka-dev python3-cffi libpython3-dev From 3975f93912ff057971517244b929447429b050f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20M=C3=A4rdian?= Date: Thu, 28 Mar 2024 17:38:52 +0100 Subject: [PATCH 3/3] RPM: avoid meson upgrade for EL9 --- .github/workflows/rpmbuild.yml | 2 +- rpm/netplan.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/rpmbuild.yml b/.github/workflows/rpmbuild.yml index 9349acb8f..25a12ea65 100644 --- a/.github/workflows/rpmbuild.yml +++ b/.github/workflows/rpmbuild.yml @@ -21,7 +21,7 @@ jobs: - fedora:latest - almalinux:10-kitten - almalinux:10 - - almalinux:9 + # - almalinux:9 # lacking meson >= 1.3.0 container: image: ${{ matrix.container }} steps: diff --git a/rpm/netplan.spec b/rpm/netplan.spec index 59caebec8..060e26d02 100644 --- a/rpm/netplan.spec +++ b/rpm/netplan.spec @@ -25,7 +25,7 @@ URL: http://netplan.io/ Source0: https://github.com/canonical/%{name}/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: gcc -BuildRequires: meson +BuildRequires: meson >= 1.3 BuildRequires: pkgconfig(bash-completion) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gio-2.0) @@ -308,4 +308,4 @@ EOF - Rebase to 0.30 * Sun Jul 2 2017 Neal Gompa - 0.23~17.04.1-1 -- Initial packaging \ No newline at end of file +- Initial packaging