52 lines
2.7 KiB
Diff
52 lines
2.7 KiB
Diff
From b97a40e3391511acd90848b18f526447f9196062 Mon Sep 17 00:00:00 2001
|
|
From: liuxinhao <liuxinhao@kylinsec.com.cn>
|
|
Date: Wed, 31 Jan 2024 09:29:47 +0800
|
|
Subject: [PATCH 12/16] feat(ci): Connect to internal CI processes
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
- 接入内部CI流程
|
|
---
|
|
.gitlab-ci.yml | 25 ++++++++++++++++++-------
|
|
1 file changed, 18 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
|
|
index 18db367..da5af29 100644
|
|
--- a/.gitlab-ci.yml
|
|
+++ b/.gitlab-ci.yml
|
|
@@ -1,12 +1,23 @@
|
|
variables:
|
|
EXTRA_DNF_REPOS: |
|
|
- [KiranBase2.4]
|
|
- name=KiranBase2.4
|
|
+ [Kiran2.6]
|
|
+ name=Kiran2.6
|
|
gpgcheck=0
|
|
- baseurl=http://192.168.120.71/kojifiles/repos/KY3.5-1-Kiran-base-2.4-build/latest/x86_64/
|
|
- RPM_BUILD_REQUIRES: 'gcc-c++ cmake libXtst-devel libX11-devel libXrandr-devel libXcursor-devel libXfixes-devel glib2-devel lightdm-qt5-devel pam-devel qt5-qtbase-devel qt5-linguist qt5-qtx11extras-devel qt5-qtsvg-devel gsettings-qt-devel kiran-widgets-qt5-devel kiran-log-qt5-devel kiran-biometrics-devel kiran-authentication-service-devel kiran-cc-daemon-devel kiran-control-panel-devel kiran-qt5-integration-devel kiran-screensaver-devel'
|
|
-
|
|
+ baseurl=http://build.kylinsec.com.cn:82/KylinSec:/3.5.2:/Customize:/Kiran2.6/standard_x86_64/
|
|
+ [KylinSec_3.5.2_Epol]
|
|
+ name=KylinSec 3.5.2 (standard_x86_64)
|
|
+ baseurl=http://build.kylinsec.com.cn:82/KylinSec:/3.5.2:/Epol/standard_x86_64/
|
|
+ enabled=1
|
|
+ gpgcheck=0
|
|
+ [KylinSec_3.5.2_Mainline]
|
|
+ name=KylinSec 3.5.2 (standard_x86_64)
|
|
+ baseurl=http://build.kylinsec.com.cn:82/KylinSec:/3.5.2:/Mainline/standard_x86_64/
|
|
+ gpgcheck=0
|
|
+ gpgkey=http://build.kylinsec.com.cn:82/KylinSec:/3.5.2:/Mainline/standard_x86_64/repodata/repomd.xml.key
|
|
+ enabled=1
|
|
+ RPM_BUILD_REQUIRES: 'cmake gcc-c++ libXtst-devel libX11-devel libXrandr-devel libXcursor-devel libXfixes-devel glib2-devel lightdm-qt5-devel pam-devel libxkbcommon-devel qt5-qtbase-devel qt5-linguist qt5-qtx11extras-devel qt5-qtsvg-devel gsettings-qt-devel kiran-widgets-qt5-devel kiran-log-qt5-devel kiran-authentication-service-devel kiran-cc-daemon-devel kiran-control-panel-devel kiran-qt5-integration-devel kiran-qdbusxml2cpp kiran-screensaver-devel polkit-qt5-1-devel'
|
|
include:
|
|
- - project: 'os/gitlab-ci'
|
|
+ - project: 'os/ks-devops'
|
|
ref: main
|
|
- file: '/cmake/cxx.gitlab-ci.yml'
|
|
+ file: '/entrypoint/develop/cmake.yml'
|
|
+
|
|
--
|
|
2.27.0
|
|
|