From 1c51eb20ecaff1b2999c526097edd406fc2170f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Wed, 12 Jun 2024 16:24:16 +0200
Subject: [PATCH] ci: Use common jobs from meta-phosh

---
 .gitlab-ci.yml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2f81ef4..a0f846d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 include:
- - remote: 'https://source.puri.sm/Librem5/librem5-ci/raw/master/librem5-pipeline-definitions.yml'
  - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/34039cd573a2df832d465bc9e4c5f543571f5241/templates/ci-fairy.yml'
+ - remote: 'https://gitlab.gnome.org/guidog/meta-phosh/-/raw/f3c92e90dcc0d65322888217429b75dd101bd0d3/ci/phosh-common-jobs.yml'
 
 stages:
  - build
@@ -126,9 +126,16 @@ format-check:
   rules:
     - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME'
 
+format-check:
+  <<: *tags
+  stage: style-checks
+  extends: .phosh-format-check
+  allow_failure: true
+
 package:deb-debian-trixie:arm64:
-  variables:
-    L5_DOCKER_IMAGE: debian:trixie
-  extends: .l5-build-debian-package
   tags:
     - librem5:arm64
+  stage: package
+  variables:
+    PHOSH_DOCKER_IMAGE: debian:trixie
+  extends: .phosh-build-debian-package