From e326eafa2de4223d23c09dc58a1ad4a9a365ff4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danielle=20For=C3=A9?= <danielle@elementary.io>
Date: Mon, 14 Apr 2025 14:32:29 -0700
Subject: [PATCH] use apt, cleanup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

sudo

fix typo

Install meson via apt

fix ambigious meson build, also install

Add DESTDIR: out

meson test →  ninja -C test

try to fix test

Revert to last working test state

try adding container matrix

Move test wrapper to meson

Use other args

Revert "Revert to last working test state"

This reverts commit 3c8d537ded6756bf39470cf6298868f0d0a45ce7.

Revert to last working state

Drop container matrix, add wrapper to meson

Need sudo in this container

Try ninja -C build test again

Okay CI isn't running for some reason lol
---
 .github/workflows/main.yml | 29 +++++++++++++++--------------
 tests/meson.build          |  5 +++++
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 26d2f97..d735539 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,26 +10,27 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+
     steps:
-      - name: Set up Python
-        uses: actions/setup-python@v1
-      - name: Install Python dependencies
-        run: |
-          python -m pip install --upgrade pip
-      - uses: actions/checkout@v2
-      - name: Install deps
+      - uses: actions/checkout@v4
+      - name: Install Dependencies
         run: |
-          sudo apt-get update
-          sudo apt-get install valac libgee-0.8-dev libgtk-4-dev libcairo-dev xvfb at-spi2-core
-          pip install meson
-          pip install ninja
+          sudo apt update
+          sudo apt install -y at-spi2-core libcairo-dev libgee-0.8-dev libgtk-4-dev meson valac xvfb
+
       - name: Build
+        env:
+          DESTDIR: out
         run: |
-          meson build -Ddebug=true -Db_coverage=true
-          ninja -C build
+          meson setup build -Ddebug=true -Db_coverage=true
+          ninja -C build install
+
       - name: Run tests
         run: |
-            meson test -C build --wrapper="xvfb-run --auto-servernum --server-num=1" || ([[ -f /home/runner/work/live-chart/live-chart/build/meson-logs/testlog-xvfb-run.txt ]] && cat /home/runner/work/live-chart/live-chart/build/meson-logs/testlog-xvfb-run.txt && exit 1)
+            meson test -C build || ([[ -f /home/runner/work/live-chart/live-chart/build/meson-logs/testlog-xvfb-run.txt ]] && cat /home/runner/work/live-chart/live-chart/build/meson-logs/testlog-xvfb-run.txt && exit 1)
 
   lint:
     name: Lint
diff --git a/tests/meson.build b/tests/meson.build
index d877461..593869e 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,3 +1,8 @@
+add_test_setup(
+    'headless',
+    exe_wrapper: [find_program('xvfb-run'), '--auto-servernum', '--server-num=1'],
+    is_default: true
+)
 
 test_sources = files(
     'area.vala',