40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
From d46319a3567927abb0f9861a95fe83d6da855464 Mon Sep 17 00:00:00 2001
|
|
From: meizhigang <meizhigang@kylinsec.com.cn>
|
|
Date: Mon, 25 Mar 2024 15:18:51 +0800
|
|
Subject: [PATCH 3/4] feature(CI): ref new CI entry point
|
|
|
|
---
|
|
.gitlab-ci.yml | 4 ++--
|
|
plugins/power/tray/power-tray.cpp | 1 -
|
|
2 files changed, 2 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
|
|
index a52f8cc..0b8aa2b 100644
|
|
--- a/.gitlab-ci.yml
|
|
+++ b/.gitlab-ci.yml
|
|
@@ -2,7 +2,7 @@ variables:
|
|
RPM_BUILD_REQUIRES: 'cmake make systemd-devel libselinux-devel gettext gcc-c++ intltool libX11-devel xerces-c-devel xsd fontconfig-devel jsoncpp-devel cairomm-devel kiran-log-gtk3-devel fmt-devel python3-jinja2 gdbus-codegen-glibmm gtest-devel libnotify-devel pulseaudio-libs-devel libxml++-devel gtkmm30-devel libgtop2-devel libgudev-devel cryptopp-devel libwnck3-devel'
|
|
|
|
include:
|
|
- - project: 'os/gitlab-ci'
|
|
+ - project: 'os/ks-devops'
|
|
ref: main
|
|
- file: '/cmake/cxx.gitlab-ci.yml'
|
|
+ file: '/entrypoint/develop/cmake.yml'
|
|
|
|
diff --git a/plugins/power/tray/power-tray.cpp b/plugins/power/tray/power-tray.cpp
|
|
index 6c96069..8f76bcb 100644
|
|
--- a/plugins/power/tray/power-tray.cpp
|
|
+++ b/plugins/power/tray/power-tray.cpp
|
|
@@ -172,7 +172,6 @@ Glib::RefPtr<Gdk::Pixbuf> PowerTray::get_pixbuf_by_icon_name(const std::string&
|
|
Gdk::RGBA success_color;
|
|
Gdk::RGBA warning_color;
|
|
Gdk::RGBA error_color;
|
|
-
|
|
|
|
if (theme_name.empty())
|
|
{
|
|
--
|
|
2.27.0
|
|
|