Merge branch 'ngala/pages-ci-templates-set-1' into 'master'

Update pages ci templates - Doxygen, HTML, Harp

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/144317



Merged-by: Hordur Freyr Yngvason <hfyngvason@gitlab.com>
Approved-by: Hordur Freyr Yngvason <hfyngvason@gitlab.com>
Co-authored-by: ngala <ngala@gitlab.com>

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

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

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