ci: Update the default workflow

Build against latest xdg-desktop-portal, and use Meson.
flatpak · Oct 19, 2023 · cb069c5 · cb069c5
1 parent 762c148
commit cb069c5
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -16,37 +16,36 @@ jobs:
           apt-get upgrade -y
           apt-get build-dep -y xdg-desktop-portal-gtk
           apt-get build-dep -y xdg-desktop-portal
-          apt-get install -y git libfuse3-dev
+          apt-get install -y git libfuse3-dev meson ninja-build
 
       # Build from git so we can test against the newest portals
       - name: Build xdg-desktop-portal dependency
         run: |
-          git clone -b 1.14.0 https://github.com/flatpak/xdg-desktop-portal.git ./xdg-desktop-portal
+          git clone -b 1.18.0 https://github.com/flatpak/xdg-desktop-portal.git ./xdg-desktop-portal
           cd ./xdg-desktop-portal
-          ./autogen.sh --sysconfdir=/etc --disable-dependency-tracking --disable-libportal
-          make -j $(getconf _NPROCESSORS_ONLN)
-          make install
+          meson setup -Dsysconfdir=/etc -Dprefix=/usr -Dlibportal=disabled _build .
+          meson compile -C _build
+          meson install -C _build
           cd ..
 
       - uses: actions/checkout@v4
 
       - name: Configure
-        run: ./autogen.sh --disable-dependency-tracking
+        run: meson setup -Dsysconfdir=/etc -Dprefix=/usr _build .
 
       - name: Build
-        run: make -j $(getconf _NPROCESSORS_ONLN)
+        run: meson compile -C _build
 
       - name: Check
-        run: make check -j $(getconf _NPROCESSORS_ONLN)
+        run: meson test -C _build
 
       - name: Install
-        run: make install
+        run: meson install -C _build
 
       - name: Upload test logs
         uses: actions/upload-artifact@v3
         if: failure() || cancelled()
         with:
           name: test logs
           path: |
-            tests/*.log
-            test-suite.log
+            _build/meson-logs/*