From ad1dd230b8ccb70e074b8de7859255168d36acc4 Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@gmail.com>
Date: Tue, 27 Aug 2024 15:38:23 +0200
Subject: ide|ci: update build configuration

---
 .gitlab-ci.yml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1cb0d99..69591bc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,19 +7,18 @@ default:
 
 build-and-test:
   stage: build
-  variables:
-    CMAKE_INSTALL_PREFIX: "ch.arknet.Turns"
-  script:
+  before_script:
     - weston --no-config --socket=$WAYLAND_DISPLAY --backend=headless &
-    - export XDG_DATA_DIRS=$(pwd)/${CMAKE_INSTALL_PREFIX}/share:${XDG_DATA_DIRS}
-    - cmake --preset default
-    - cmake --build --preset default --config $BUILD_TYPE
+    - export XDG_DATA_DIRS=$(pwd)/ch.arknet.Turns/share:${XDG_DATA_DIRS}
+  script:
+    - cmake --preset ci
+    - cmake --build --preset ci --config $BUILD_TYPE
     - cmake --install build --config $BUILD_TYPE
-    - glib-compile-schemas ${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas
-    - dbus-run-session -- ctest --preset default --build-config $BUILD_TYPE
+    - glib-compile-schemas ch.arknet.Turns/share/glib-2.0/schemas
+    - dbus-run-session -- ctest --preset ci --build-config $BUILD_TYPE
   artifacts:
     paths:
-      - ${CMAKE_INSTALL_PREFIX}/
+      - ch.arknet.Turns/
       - build/
     expire_in: 24 hours
   parallel:
-- 
cgit v1.2.3