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 diff --git a/.github/workflows/rpmbuild.yml b/.github/workflows/rpmbuild.yml index 2a788febc..f13963f51 100644 --- a/.github/workflows/rpmbuild.yml +++ b/.github/workflows/rpmbuild.yml @@ -19,19 +19,23 @@ jobs: container: - fedora:latest # - fedora:rawhide - - rockylinux:9 + - almalinux:10-kitten + # - rockylinux:10 container: image: ${{ matrix.container }} steps: + - name: Install Build-Dependencies + run: | + # for 'dnf builddep' and 'dnf config-manager' + dnf -y install git rpmdevtools 'dnf-command(config-manager)' + dnf config-manager --set-enabled crb || true # Meson/CMocka on EL10 + dnf config-manager --set-enabled nfv || true # OVS on EL10 + dnf -y install epel-release || true # Pandoc, python-rich, ... - uses: actions/checkout@v2 - name: Build & Test run: | cat /etc/os-release - dnf -y install dnf-plugins-core rpmdevtools # for 'dnf builddep' - dnf -y install epel-release || true - dnf config-manager --set-enabled crb || true # Meson/CMocka on EL9 - dnf -y install centos-release-nfv-openvswitch || true # OVS on EL9 - dnf -y builddep rpm/netplan.spec adduser test chown -R test:test . + dnf -y builddep rpm/netplan.spec su test -c 'rpmbuild -bi -D "debug_package %{nil}" --build-in-place rpm/netplan.spec' diff --git a/meson.build b/meson.build index 68c740f96..16f816610 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 = [ diff --git a/rpm/netplan.spec b/rpm/netplan.spec index fcc6e101a..c86d70100 100644 --- a/rpm/netplan.spec +++ b/rpm/netplan.spec @@ -15,7 +15,7 @@ %endif Name: netplan -Version: 0.106 +Version: 1.1 Release: 0%{?dist} Summary: Network configuration tool using YAML Group: System Environment/Base @@ -24,7 +24,7 @@ URL: http://netplan.io/ Source0: https://github.com/canonical/%{name}/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: gcc -BuildRequires: meson >= 0.61 +BuildRequires: meson >= 1.3 BuildRequires: pkgconfig(bash-completion) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gio-2.0) @@ -42,7 +42,6 @@ BuildRequires: %{_sbindir}/ip BuildRequires: pkgconfig(cmocka) BuildRequires: python3dist(coverage) BuildRequires: dbus-x11 -BuildRequires: python3dist(netifaces) BuildRequires: python3dist(pycodestyle) BuildRequires: python3dist(pyflakes) BuildRequires: python3dist(pytest)