1 Star 0 Fork 17

meizhigang/kiran-cc-daemon_src

加入 Gitee
与超过 1200万 开发者一起发现、参与优秀开源项目,私有仓库也完全免费 :)
免费加入
该仓库未声明开源许可证文件(LICENSE),使用请关注具体项目描述及其代码上游依赖。
克隆/下载
0010-feature-CI-ref-new-CI-entry-point.patch 1.44 KB
一键复制 编辑 原始数据 按行查看 历史
meizhigang 提交于 2024-04-01 11:03 . fix(*):Fix some bugs with patch
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
马建仓 AI 助手
尝试更多
代码解读
代码找茬
代码优化
1
https://gitee.com/meizhigang/kiran-cc-daemon_src.git
git@gitee.com:meizhigang/kiran-cc-daemon_src.git
meizhigang
kiran-cc-daemon_src
kiran-cc-daemon_src
master

搜索帮助