From 3ccebc465ca01fb8cd3fc89f620cbf12898e2584 Mon Sep 17 00:00:00 2001
From: Naman Jagdish Gala <ngala@gitlab.com>
Date: Tue, 13 Feb 2024 21:59:41 +0000
Subject: [PATCH] Update pages ci templates - Doxygen
Related: https://gitlab.com/gitlab-org/gitlab/-/issues/377585+
Changelog: fixed
---
.../ci/templates/Pages/Doxygen.gitlab-ci.yml | 13 +++++++++++-
.../ci/templates/Pages/HTML.gitlab-ci.yml | 7 +++----
.../ci/templates/Pages/Harp.gitlab-ci.yml | 20 +++++++++++++------
3 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/lib/gitlab/ci/templates/Pages/Doxygen.gitlab-ci.yml b/lib/gitlab/ci/templates/Pages/Doxygen.gitlab-ci.yml
index 95eab65e62941..4e36db6afe976 100644
--- a/lib/gitlab/ci/templates/Pages/Doxygen.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/Doxygen.gitlab-ci.yml
@@ -7,9 +7,20 @@ default:
# Full project: https://gitlab.com/pages/doxygen
image: alpine
+before_script:
+ - apk update
+ - apk add doxygen
+## Uncomment the following line if you use graphviz dot graphs
+# - apk add ttf-freefont graphviz
+
+test:
+ script:
+ - doxygen doxygen/Doxyfile
+ rules:
+ - if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
+
pages:
script:
- - apk update && apk add doxygen
- doxygen doxygen/Doxyfile
- mv doxygen/documentation/html/ public/
environment: production
diff --git a/lib/gitlab/ci/templates/Pages/HTML.gitlab-ci.yml b/lib/gitlab/ci/templates/Pages/HTML.gitlab-ci.yml
index 9f3ba6d5dd4ae..2e5446b821186 100644
--- a/lib/gitlab/ci/templates/Pages/HTML.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/HTML.gitlab-ci.yml
@@ -4,14 +4,13 @@
# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Pages/HTML.gitlab-ci.yml
# Full project: https://gitlab.com/pages/plain-html
+image: busybox
+
pages:
stage: deploy
environment: production
script:
- - mkdir .public
- - cp -r ./* .public
- - rm -rf public
- - mv .public public
+ - echo "The site will be deployed to $CI_PAGES_URL"
artifacts:
paths:
- public
diff --git a/lib/gitlab/ci/templates/Pages/Harp.gitlab-ci.yml b/lib/gitlab/ci/templates/Pages/Harp.gitlab-ci.yml
index 313cb99a84150..f942dc216e032 100644
--- a/lib/gitlab/ci/templates/Pages/Harp.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/Harp.gitlab-ci.yml
@@ -5,15 +5,23 @@
default:
# Full project: https://gitlab.com/pages/harp
- image: node:4.2.2
+ image: node:16
+
+cache:
+ paths:
+ - node_modules
+
+test:
+ script:
+ - npm install -g harp less
+ - harp source public
+ rules:
+ - if: '$CI_COMMIT_REF_NAME != $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "merge_request_event"'
pages:
- cache:
- paths:
- - node_modules
script:
- - npm install -g harp
- - harp compile ./ public
+ - npm install -g harp less
+ - harp source public
artifacts:
paths:
- public
--
GitLab