From df2b5f98468b10237b3d70068f71a1e842225a08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Wed, 11 Sep 2024 10:06:26 +0200 Subject: [PATCH 1/6] ci: Drop `except:`s MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit They're not used much nowadays and complicate the logic Signed-off-by: Guido Günther Part-of: --- .gitlab-ci.yml | 53 -------------------------------------------------- 1 file changed, 53 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 36485d179..dc75812f8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -121,9 +121,6 @@ build:native-debian-trixie: artifacts: paths: - _build - except: - variables: - - $PKG_ONLY == "1" startup-test:native-debian-trixie: stage: test+docs @@ -155,10 +152,6 @@ startup-test:native-debian-trixie: when: always paths: - startup.log - except: - variables: - - $PKG_ONLY == "1" - - $SCREENSHOTS_ONLY == "1" unit-test:native-debian-trixie: stage: test+docs @@ -173,10 +166,6 @@ unit-test:native-debian-trixie: paths: - _build - coverage-*.json - except: - variables: - - $PKG_ONLY == "1" - - $SCREENSHOTS_ONLY == "1" asan-test:native-debian-trixie: stage: test+docs @@ -189,10 +178,6 @@ asan-test:native-debian-trixie: - meson setup -Dphoc_tests=enabled -Dtools=false -Db_sanitize=address -Dbuildtype=debug _build-asan - meson compile -C _build-asan ./data/glib-compile-schemas:custom - ${XVFB_RUN} meson test --print-errorlogs -C _build-asan --suite unit --timeout-multiplier 5 - except: - variables: - - $PKG_ONLY == "1" - - $SCREENSHOTS_ONLY == "1" allow_failure: true screenshot:native-debian-trixie: @@ -218,9 +203,6 @@ screenshot:native-debian-trixie: paths: - screenshots/ - _build/meson-logs/testlog.txt - except: - variables: - - $PKG_ONLY == "1" build-doc: stage: test+docs @@ -238,18 +220,10 @@ build-doc: artifacts: paths: - _reference - except: - variables: - - $PKG_ONLY == "1" - - $SCREENSHOTS_ONLY == "1" check-po: stage: test+docs extends: .phosh-check-po - except: - variables: - - $PKG_ONLY == "1" - - $SCREENSHOTS_ONLY == "1" check-license-headers: stage: test+docs @@ -260,10 +234,6 @@ check-license-headers: # Checks .c and .h files begin with a license header as # defined in HACKING.md - ./tools/check-license-headers.py - except: - variables: - - $PKG_ONLY == "1" - - $SCREENSHOTS_ONLY == "1" check-dist: stage: test+docs @@ -277,10 +247,6 @@ check-dist: script: - meson setup --werror _build-dist - meson dist -C _build-dist --no-tests - except: - variables: - - $PKG_ONLY == "1" - - $SCREENSHOTS_ONLY == "1" build:native-alpinelinux-edge: stage: build @@ -296,10 +262,6 @@ build:native-alpinelinux-edge: - git submodule update --recursive - meson setup --werror -Dphoc_tests=disabled _build - meson compile -C _build - except: - variables: - - $PKG_ONLY == "1" - - $SCREENSHOTS_ONLY == "1" unit-test:native-alpinelinux-edge: stage: test+docs @@ -318,10 +280,6 @@ unit-test:native-alpinelinux-edge: paths: - _build when: manual - except: - variables: - - $PKG_ONLY == "1" - - $SCREENSHOTS_ONLY == "1" check-consistency: stage: test+docs @@ -393,10 +351,6 @@ coverage: needs: - unit-test:native-debian-trixie - screenshot:native-debian-trixie - except: - variables: - - $PKG_ONLY == "1" - - $SCREENSHOTS_ONLY == "1" package:deb-debian-trixie:arm64: stage: package @@ -407,9 +361,6 @@ package:deb-debian-trixie:arm64: extends: .phosh-build-debian-package tags: - aarch64 - except: - variables: - - $SCREENSHOTS_ONLY == "1" pages: stage: deploy @@ -422,10 +373,6 @@ pages: - public only: - main - except: - variables: - - $PKG_ONLY == "1" - - $SCREENSHOTS_ONLY == "1" rust-bindings: stage: triggers -- GitLab From c6844803453fd5d1ff5ebf4b0520dca2dffd013a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Wed, 11 Sep 2024 10:10:31 +0200 Subject: [PATCH 2/6] ci: Drop submodule updates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Not needed as we use meson subprojects Signed-off-by: Guido Günther Part-of: --- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dc75812f8..44a43814b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,7 +62,6 @@ variables: .build_step: &build_step script: - - git submodule update --recursive - 'echo "Build opts: ${BUILD_OPTS}"' - meson setup ${BUILD_OPTS} _build - meson compile -C _build @@ -259,7 +258,6 @@ build:native-alpinelinux-edge: paths: - _build script: - - git submodule update --recursive - meson setup --werror -Dphoc_tests=disabled _build - meson compile -C _build -- GitLab From 6d1c5f97f3130d16ee7390038cb910230364d9df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Wed, 11 Sep 2024 10:13:00 +0200 Subject: [PATCH 3/6] ci: Build library MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make sure this works as expected Signed-off-by: Guido Günther Part-of: --- .gitlab-ci.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 44a43814b..9e4b6db3f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -121,6 +121,20 @@ build:native-debian-trixie: paths: - _build +build:lib-debian-trixie: + stage: build + image: ${DEBIAN_IMAGE} + variables: + BUILD_OPTS: --werror -Dtests=false -Dtools=false -Dbindings=false + <<: *build_before_script + <<: *trixie_vars + script: + - meson setup ${BUILD_OPTS} _build + - meson compile -C _build install + artifacts: + paths: + - _build + startup-test:native-debian-trixie: stage: test+docs image: ${DEBIAN_IMAGE} -- GitLab From c555ead7b22b3a2e2451c5497b82baf6e66495fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Wed, 11 Sep 2024 10:21:01 +0200 Subject: [PATCH 4/6] ci: Verify libphosh install MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Compile a small stub to ensure the pkgconf file works Signed-off-by: Guido Günther Part-of: --- .gitlab-ci.yml | 7 ++++--- .gitlab-ci/libphosh-test.c | 13 +++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 .gitlab-ci/libphosh-test.c diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9e4b6db3f..0ce73a184 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -125,12 +125,13 @@ build:lib-debian-trixie: stage: build image: ${DEBIAN_IMAGE} variables: - BUILD_OPTS: --werror -Dtests=false -Dtools=false -Dbindings=false + BUILD_OPTS: --werror -Dtests=false -Dtools=false -Dbindings-lib=true <<: *build_before_script - <<: *trixie_vars script: - meson setup ${BUILD_OPTS} _build - - meson compile -C _build install + - meson compile -C _build + - meson install -C _build + - gcc -Wall -O2 $(pkgconf --cflags libphosh-0) .gitlab-ci/libphosh-test.c $(pkgconf --libs libphosh-0) artifacts: paths: - _build diff --git a/.gitlab-ci/libphosh-test.c b/.gitlab-ci/libphosh-test.c new file mode 100644 index 000000000..31dd99cd9 --- /dev/null +++ b/.gitlab-ci/libphosh-test.c @@ -0,0 +1,13 @@ +/* + * Copyright (C) 2024 The Phosh Developers + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Author: Guido Günther + */ + +#include + +int main(void) +{ +} -- GitLab From 72a6825b718d026f627c796f8f8fe0fcff24d5f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Tue, 10 Sep 2024 13:37:21 +0200 Subject: [PATCH 5/6] upcoming-events: Add missing plugin prefs variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise the `Plugin=` path is broken in the generated .plugin file Fixes: e1a1ae1a8 ("upcoming-events: Add preferences widget") Signed-off-by: Guido Günther Part-of: --- plugins/upcoming-events/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/upcoming-events/meson.build b/plugins/upcoming-events/meson.build index 424e43bab..4c429f997 100644 --- a/plugins/upcoming-events/meson.build +++ b/plugins/upcoming-events/meson.build @@ -45,6 +45,7 @@ phosh_upcoming_events_plugin = shared_module( pluginconf = configuration_data() pluginconf.set('name', name) pluginconf.set('plugins_dir', plugins_dir) +pluginconf.set('plugin_prefs_dir', plugin_prefs_dir) i18n.merge_file( input: configure_file( -- GitLab From f76f0d68d7c62fedd1e3834e91073265030f3a8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Tue, 10 Sep 2024 21:54:18 +0200 Subject: [PATCH 6/6] libphosh: Drop generated header MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This got removed in db3925449 ("wwan-mm: Switch to MM proxies for modem and modem3gpp") Signed-off-by: Guido Günther Part-of: --- src/libphosh.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libphosh.h b/src/libphosh.h index dfbd861d2..1c6d82a50 100644 --- a/src/libphosh.h +++ b/src/libphosh.h @@ -165,7 +165,6 @@ G_BEGIN_DECLS #include "dbus/phosh-osk0-dbus.h" #include "dbus/phosh-screen-saver-dbus.h" #include "dbus/phosh-screenshot-dbus.h" -#include "dbus/phosh-wwan-mm-dbus.h" #include "dbus/phosh-wwan-ofono-dbus.h" #include "dbus/portal-dbus.h" -- GitLab