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.

Sign up for GitHub

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

Drop Autotools #64

Merged
merged 2 commits into from
Aug 22, 2024
Merged

Drop Autotools #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a2cf23
Drop Autotools
GeorgesStavracas Aug 22, 2024
a8303cb
build: Use "meson setup" instead of just "meson"
GeorgesStavracas Aug 22, 2024
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
113 changes: 18 additions & 95 deletions .github/workflows/check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,70 +16,6 @@ on:
- main

jobs:
check:
name: Build with Autotools and gcc, and test
runs-on: ubuntu-22.04
steps:
- name: Install Dependencies
run: |
sudo apt-get update
sudo apt-get install -y \
autoconf \
autoconf-archive \
automake \
autopoint \
clang \
dbus \
docbook-xml \
docbook-xsl \
libglib2.0-dev \
libtool \
xsltproc \
${NULL+}
- name: Check out xdg-dbus-proxy
uses: actions/checkout@v1
with:
submodules: true
- name: Create logs dir
run: mkdir test-logs
- name: autoreconf
run: autoreconf -fi
- name: configure
run: |
mkdir _build
( cd _build && ../configure --enable-man )
env:
CFLAGS: >-
-O2
-Wp,-D_FORTIFY_SOURCE=2
-fsanitize=address
-fsanitize=undefined
- name: Build xdg-dbus-proxy
run: make -C _build -j $(getconf _NPROCESSORS_ONLN) V=1
- name: Run tests
run: make -C _build -j $(getconf _NPROCESSORS_ONLN) check VERBOSE=1
- name: Run tests
run: make -C _build -j $(getconf _NPROCESSORS_ONLN) check VERBOSE=1
- name: Collect overall test logs on failure
if: failure()
run: mv _build/test-suite.log test-logs/ || true
- name: Collect individual test logs on cancel
if: failure() || cancelled()
run: mv _build/tests/*.log test-logs/ || true
- name: Upload test logs
uses: actions/upload-artifact@v1
if: failure() || cancelled()
with:
name: test logs
path: test-logs
- name: install
run: |
make -C _build install DESTDIR="$(pwd)/DESTDIR"
( cd DESTDIR && find -ls )
- name: distcheck
run: |
make -C _build -j $(getconf _NPROCESSORS_ONLN) distcheck VERBOSE=1

meson:
name: Build with Meson and gcc, and test
runs-on: ubuntu-20.04
Expand All @@ -103,7 +39,7 @@ jobs:
run: mkdir test-logs
- name: configure
run: |
meson _build -Db_sanitize=address,undefined
meson setup . _build
- name: Build xdg-dbus-proxy
run: ninja -C _build -v
- name: Run tests
Expand All @@ -129,7 +65,7 @@ jobs:
mkdir tests/use-as-subproject/subprojects
tar -C tests/use-as-subproject/subprojects -xf _build/meson-dist/xdg-dbus-proxy-*.tar.xz
mv tests/use-as-subproject/subprojects/xdg-dbus-proxy-* tests/use-as-subproject/subprojects/dbus-proxy
( cd tests/use-as-subproject && meson _build )
( cd tests/use-as-subproject && meson setup . _build )
ninja -C tests/use-as-subproject/_build -v
meson test -C tests/use-as-subproject/_build
DESTDIR="$(pwd)/DESTDIR-as-subproject" meson install -C tests/use-as-subproject/_build
Expand Down Expand Up @@ -167,45 +103,38 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install -y \
autoconf \
autoconf-archive \
automake \
autopoint \
clang \
dbus \
docbook-xml \
docbook-xsl \
libglib2.0-dev \
libtool \
meson \
xsltproc \
${NULL+}
- name: Check out xdg-dbus-proxy
uses: actions/checkout@v1
with:
submodules: true
- name: autoreconf
run: autoreconf -fi
- name: Create logs dir
run: mkdir test-logs
- name: configure
run: ./configure
run: |
meson setup . _build -Db_sanitize=address,undefined
env:
CC: clang
CFLAGS: >-
-O2
-Wp,-D_FORTIFY_SOURCE=2
-fsanitize=address
-fsanitize=undefined
- name: Build xdg-dbus-proxy
run: make -j $(getconf _NPROCESSORS_ONLN) V=1
run: ninja -C _build -v
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
- name: Run tests
run: make -j $(getconf _NPROCESSORS_ONLN) check VERBOSE=1
run: meson test -C _build -v
- name: Collect overall test logs on failure
if: failure()
run: mv test-suite.log test-logs/ || true
run: mv _build/meson-logs/testlog.txt test-logs/ || true
- name: Collect individual test logs on cancel
if: failure() || cancelled()
run: mv tests/*.log test-logs/ || true
run: mv _build/meson-logs/testlog.txt test-logs/ || true
- name: Upload test logs
uses: actions/upload-artifact@v1
if: failure() || cancelled()
Expand All @@ -215,23 +144,20 @@ jobs:

valgrind:
name: Run tests in valgrind
needs: check # Don't run expensive test if main check fails
needs: meson # Don't run expensive test if main check fails
runs-on: ubuntu-20.04 # Might as well test with a different one too
steps:
- name: Install Dependencies
run: |
sudo apt-get update
sudo apt-get install -y \
autoconf \
autoconf-archive \
automake \
autopoint \
clang \
dbus \
docbook-xml \
docbook-xsl \
libglib2.0-dev \
libtool \
meson \
valgrind \
xsltproc \
${NULL+}
Expand All @@ -241,26 +167,23 @@ jobs:
submodules: true
- name: Create logs dir
run: mkdir test-logs
- name: autoreconf
run: autoreconf -fi
- name: configure
run: |
mkdir _build
( cd _build && ../configure )
meson setup . _build
env:
CFLAGS: >-
-O2
-Wp,-D_FORTIFY_SOURCE=2
- name: Build xdg-dbus-proxy
run: make -C _build -j $(getconf _NPROCESSORS_ONLN) V=1
run: ninja -C _build -v
- name: Run tests
run: make -C _build -j $(getconf _NPROCESSORS_ONLN) check VERBOSE=1
run: meson test -C _build -v
- name: Collect overall test logs on failure
if: failure()
run: mv _build/test-suite.log test-logs/ || true
run: mv _build/meson-logs/testlog.txt test-logs/ || true
- name: Collect individual test logs on cancel
if: failure() || cancelled()
run: mv _build/tests/*.log test-logs/ || true
run: mv _build/meson-logs/testlog.txt test-logs/ || true
- name: Upload test logs
uses: actions/upload-artifact@v1
if: failure() || cancelled()
Expand Down
18 changes: 0 additions & 18 deletions Makefile-docs.am
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions Makefile.am
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions autogen.sh
View file
Open in desktop

This file was deleted.

63 changes: 0 additions & 63 deletions configure.ac
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions m4/ax_ac_append_to_file.m4
View file
Open in desktop

This file was deleted.

Loading