[websites/docs-kde-org] /: use kdoctools6 for kf5 repositories too. Only css is used and they are mostly the same on both
Johnny Jazeix <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit 394bdddf92148e48872a63cff982fac19d67312d by Johnny Jazeix.
Committed on 08/08/2026 at 10:12.
Pushed by jjazeix into branch 'master'.
use kdoctools6 for kf5 repositories too. Only css is used and they are mostly the same on both
M +1 -3 .gitlab-ci.yml
M +0 -4 .kde-ci.yml
https://invent.kde.org/websites/docs-kde-org/-/commit/394bdddf92148e48872a63cff982fac19d67312d
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8d7272a..fd46e02 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,14 +24,12 @@ website-generation:
- git config --global --add safe.directory $CI_PROJECT_DIR
- git clone https://invent.kde.org/sysadmin/ci-notary-service.git --depth=1
- mkdir -p logs
- # Retrieve kdoctools5 from suse-qt5.15 registry
- - KDECI_PACKAGE_PROJECT=teams/ci-artifacts/suse-qt5.15 python3 -u ci-utilities/run-ci-build.py --project $CI_PROJECT_NAME --branch $CI_COMMIT_REF_NAME --platform Linux/Qt5/Shared --only-setup-environment
# Retrieve kdoctools6 from suse-qt6.11 registry
- KDECI_PACKAGE_PROJECT=teams/ci-artifacts/suse-qt6.11 python3 -u ci-utilities/run-ci-build.py --project $CI_PROJECT_NAME --branch $CI_COMMIT_REF_NAME --platform Linux/Qt6/Shared --only-setup-environment
- export PYTHONPATH=$PWD/ci-utilities/
- ./kdedocgen.py -r -s -l doclogconfig.ini -c docgen_conf.ini
- ./create_generated_used.php work/ >website/generated_used.inc.php 2>logs/genused.log
- - cp -R _install/share/doc/HTML/en/kdoctools5-common website/trunk_kf5/en/
+ - cp -R _install/share/doc/HTML/en/kdoctools6-common/ website/trunk_kf5/en/kdoctools5-common
- cp -R _install/share/doc/HTML/en/kdoctools6-common website/trunk_kf6/en/
- cp -R search/ website/
- sed -i "s/WEBSITE_DOMAIN/${WEBSITE_DOMAIN}/g" website/search/omegaconf/omega.conf
diff --git a/.kde-ci.yml b/.kde-ci.yml
index 0d35b00..c27fdd6 100644
--- a/.kde-ci.yml
+++ b/.kde-ci.yml
@@ -1,10 +1,6 @@
# SPDX-FileCopyrightText: None
# SPDX-License-Identifier: CC0-1.0
Dependencies:
-- 'on': ['Linux/Qt5']
- 'require':
- 'frameworks/kdoctools': '@stable'
-
- 'on': ['Linux/Qt6']
'require':
'frameworks/kdoctools': '@latest-kf6'