From 384ec20357778628f8d394c82ce8c890e59549f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Sun, 20 Apr 2025 21:46:53 +0200
Subject: [PATCH 1/2] ci: Update for fdo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Drop the now unneeded tags and the arm64 build

Signed-off-by: Guido Günther <agx@sigxcpu.org>
---
 .gitlab-ci.yml | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 846287e..d0538f0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,13 +31,8 @@ workflow:
   image:
     name: debian:trixie
 
-.tags: &tags
-  tags:
-    - librem5:arm64
-
 # Regular, full build
 build:gcc:native-debian-trixie:full:
-  <<: *tags
   <<: *image
   <<: *before_script
   stage: build
@@ -53,7 +48,6 @@ build:gcc:native-debian-trixie:full:
 
 # Minimal build for e.g. submodule usage
 build:gcc:native-debian-trixie:lib:
-  <<: *tags
   <<: *image
   <<: *before_script
   stage: build
@@ -68,7 +62,6 @@ build:gcc:native-debian-trixie:lib:
 build:clang:native-debian-trixie:full:
   variables:
     EXTRA_PKGS: clang
-  <<: *tags
   <<: *image
   <<: *before_script
   stage: build
@@ -84,7 +77,6 @@ build:clang:native-debian-trixie:full:
   allow_failure: true
 
 test:native-debian-trixie:
-  <<: *tags
   <<: *image
   <<: *before_script
   stage: test
@@ -98,26 +90,16 @@ test:native-debian-trixie:
       - $PKG_ONLY == "1"
 
 check-consistency:
-  <<: *tags
   stage: test
   extends: .phosh-check-consistency
 
 format-check:
-  <<: *tags
   stage: style-checks
   extends: .phosh-format-check
   allow_failure: true
 
 check-meson:
-  <<: *tags
   stage: style-checks
   extends:
     - .phosh-check-meson
 
-package:deb-debian-trixie:arm64:
-  tags:
-    - librem5:arm64
-  stage: package
-  variables:
-    PHOSH_DOCKER_IMAGE: debian:trixie
-  extends: .phosh-build-debian-package

From a78941f1d846d398f1c91d11c79d2242f5bdc0a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Sun, 20 Apr 2025 21:51:42 +0200
Subject: [PATCH 2/2] ci: Allow coverage collection to fail
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Guido Günther <agx@sigxcpu.org>
---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d0538f0..1f50acd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -84,7 +84,8 @@ test:native-debian-trixie:
     - build:gcc:native-debian-trixie:full
   coverage: '/^\s+lines\.+:\s+([\d.]+\%)\s+/'
   script:
-    - dbus-run-session ninja -C _build test coverage
+    - dbus-run-session ninja -C _build test
+    - ninja -C _build coverage || true
   except:
     variables:
       - $PKG_ONLY == "1"