From 8bc5593b7551e075759bddd00b85b27f02c3cf67 Mon Sep 17 00:00:00 2001
From: Sander Sweers <infirit@gmail.com>
Date: Fri, 22 Jul 2022 19:48:28 +0200
Subject: [PATCH] Fix jobs

---
 .github/workflows/check.yml   | 20 +++++++++++++-------
 .github/workflows/release.yml | 10 ++++------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 5b4822b8f..ef5965d9d 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -42,10 +42,13 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - run: apt-get update
-      - run: apt-get install -y -qq --no-install-recommends automake autoconf libtool autopoint gettext libglib2.0-dev python-gi-dev libbluetooth-dev iproute2
-      - run: python3 -m pip install cython mypy pycairo>=1.16.3
-      - run: ./autogen.sh
+      - run: apt-get install -y -qq --no-install-recommends meson gettext libglib2.0-dev python3-dev python-gi-dev libbluetooth-dev
+      - run: python3 -m pip install mypy cython pycairo>=1.16.3
+      - run: meson --warnlevel 3 --buildtype debug -Druntime_deps_check=false builddebug
+      - run: ninja -v -C builddebug
       - run: python3 -m mypy -p blueman --strict
+        working-directory:
+          ./builddebug
         env:
           MYPYPATH: ${{ github.workspace }}/stubs
 
@@ -63,9 +66,12 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - run: apt-get update
-      - run: apt-get install -y -qq --no-install-recommends automake autoconf libtool autopoint gettext libglib2.0-dev python-gi-dev libbluetooth-dev iproute2 libgirepository1.0-dev gir1.2-gtk-3.0 gir1.2-nm-1.0 libpulse0 libpulse-mainloop-glib0
+      - run: apt-get install -y -qq --no-install-recommends meson gettext gettext libglib2.0-dev python-gi-dev libbluetooth-dev iproute2 libgirepository1.0-dev gir1.2-gtk-3.0 gir1.2-nm-1.0 libpulse0 libpulse-mainloop-glib0
       - run: python3 -m pip install cython pygobject
-      - run: ./autogen.sh
-      - run: make -C module
+      - run: meson --warnlevel 3 --buildtype debug -Druntime_deps_check=false builddebug
+      - run: ninja -v -C builddebug
       - run: touch /dev/rfkill
-      - run: PYTHONPATH=module/.libs python3 -m unittest
+      - run: cp -R test builddebug
+      - run: PYTHONPATH=./module python3 -m unittest
+        working-directory:
+          ./builddebug
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1183fef7a..d56eff0fd 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,13 +17,11 @@ jobs:
           notes="${notes//$'\r'/'%0D'}"
           echo ::set-output name=NOTES::$notes
         id: notes
-      - run: '[ -n "${{ steps.notes.outputs.NOTES }}" ] || (echo "Failed to parse changelog" && exit 1)'
-      - run: grep --quiet '^AC_INIT(\[blueman\], \[${{ steps.version.outputs.VERSION }}\]' configure.ac || (echo "Did not find expected verson in configure.ac" && exit 1)
-      - run: "grep --quiet \"version: '${{ steps.version.outputs.VERSION }}'\" meson.build || (echo 'Did not find expected verson in meson.build' && exit 1)"
       - run: sudo apt-get update
-      - run: sudo apt-get install -y -qq --no-install-recommends automake autoconf libtool autopoint gettext cython3 libglib2.0-dev python3-dev python-gi-dev libbluetooth-dev
-      - run: CYTHONEXEC=cython3 ./autogen.sh
-      - run: CYTHONEXEC=cython3 make distcheck
+      - run: sudo apt-get install -y -qq --no-install-recommends meson jq
+      - run: meson --warnlevel 3 --buildtype release -Druntime_deps_check=false build
+      - run: if [[ $(meson introspect --projectinfo build | jq -r .version) != ${{ steps.version.outputs.VERSION }} ]]; then echo "Did not find expected version in configure.ac"; exit 1; fi
+      - run: ./make_release.sh
       - uses: softprops/action-gh-release@v1
         with:
           draft: true