Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build-sys: Remove autotools #313

Merged
merged 1 commit into from
Aug 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
168 changes: 0 additions & 168 deletions .github/workflows/test-meson.yaml

This file was deleted.

40 changes: 20 additions & 20 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Test with autotools
name: Test with meson

on: [push, pull_request]

Expand All @@ -8,22 +8,24 @@ permissions:
jobs:
build:
runs-on: ubuntu-latest
name: "Build"
name: "Build with ASAN"
steps:
- name: Checkout repository
uses: actions/checkout@v3
- name: Install dependencies
run: sudo ./hacking/installdeps.sh
- name: Install fsck.erofs
run: sudo apt install erofs-utils
- name: Install go-md2man
run: sudo apt install go-md2man
- name: Configure
run: ./autogen.sh && ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH) CFLAGS='-Wall -Werror'
run: meson setup build --prefix=/usr --werror -Db_sanitize=address,undefined
- name: Build
run: make -j $(nproc) CFLAGS='-fsanitize=address -fsanitize=undefined'
run: meson compile -C build
- name: Unit tests
run: make check
run: meson test -C build
- name: Capture build
run: make install DESTDIR=$(pwd)/instroot && tar -C instroot -czf composefs.tar .
run: DESTDIR=$(pwd)/instroot meson install -C build && tar -C instroot -czf composefs.tar .
- name: Upload binary
uses: actions/upload-artifact@v2
with:
Expand All @@ -32,18 +34,18 @@ jobs:
# This build doesn't enable ASAN, which e.g. makes it easier to use with Rust
build-noasan:
runs-on: ubuntu-latest
name: "Build"
name: "Build without ASAN"
steps:
- name: Checkout repository
uses: actions/checkout@v3
- name: Install dependencies
run: sudo ./hacking/installdeps.sh
- name: Configure
run: ./autogen.sh && ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH) CFLAGS='-Wall -Werror'
run: meson setup build --prefix=/usr --werror
- name: Build
run: make -j $(nproc)
run: meson compile -C build
- name: Capture build
run: make install DESTDIR=$(pwd)/instroot && tar -C instroot -czf composefs.tar .
run: DESTDIR=$(pwd)/instroot meson install -C build && tar -C instroot -czf composefs.tar .
- name: Upload binary
uses: actions/upload-artifact@v2
with:
Expand All @@ -61,11 +63,10 @@ jobs:
apt-get update -y
ALLOW_MISSING="libfsverity-dev" ./hacking/installdeps.sh
- name: Configure
run: |
./autogen.sh
./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH) CFLAGS='-Wall -Werror'
run: meson setup build --werror
- name: Build
run: make -j $(nproc) CFLAGS='-fsanitize=address -fsanitize=undefined'
# focal's meson is too old for 'meson compile'
run: ninja -C build
build-unit-cross:
runs-on: ubuntu-latest
name: Build on ${{ matrix.arch }}
Expand Down Expand Up @@ -99,10 +100,9 @@ jobs:
run: |
apt-get update -y
./hacking/installdeps.sh
./autogen.sh
./configure CFLAGS='-Wall -Werror'
make -j $(nproc)
make check
meson setup build --werror
meson compile -C build
meson test -C build --timeout-multiplier 10
integration:
needs: build
runs-on: ubuntu-latest
Expand Down Expand Up @@ -163,6 +163,6 @@ jobs:
- name: Install dependencies
run: sudo ./hacking/installdeps.sh
- name: Configure
run: ./autogen.sh && ./configure CFLAGS='-Wall -Werror'
run: meson setup build --werror
- name: Run make distcheck
run: make -j$(nproc) distcheck
run: meson dist -C build
42 changes: 0 additions & 42 deletions Makefile.am

This file was deleted.

3 changes: 0 additions & 3 deletions autogen.sh

This file was deleted.

7 changes: 4 additions & 3 deletions composefs.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ License: GPL-3.0-or-later AND LGPL-2.0-or-later AND Apache-2.0
URL: https://github.com/containers/composefs
Source0: https://github.com/containers/composefs/releases/download/v%{version}/%{name}-%{version}.tar.xz

BuildRequires: gcc automake libtool openssl-devel fuse3-devel
BuildRequires: gcc meson openssl-devel fuse3-devel
%if %{with man}
BuildRequires: go-md2man
%endif
Expand Down Expand Up @@ -43,6 +43,8 @@ Library files for %{name}.
%autosetup

%build
%meson
%meson_build
%configure \
--disable-static \
%if %{with man}
Expand All @@ -52,8 +54,7 @@ Library files for %{name}.
%make_build

%install
%make_install
rm -rf %{buildroot}%{_libdir}/libcomposefs.la
%meson_install

%files devel
%{_includedir}/libcomposefs
Expand Down
Loading
Loading