From cd7259a9d3aa159d8015c17731e6a1a249da0b74 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jerome@riseup.net>
Date: Tue, 18 Jan 2022 21:40:40 -0500
Subject: [PATCH] update some gitlab pages bits
---
howto/gitlab.md | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/howto/gitlab.md b/howto/gitlab.md
index ac0d6630..5e4059d7 100644
--- a/howto/gitlab.md
+++ b/howto/gitlab.md
@@ -372,6 +372,14 @@ rolling. For example, this will publish a `hugo` site:
only:
- main
+If `.gitlab-ci.yml` already contains a job in the `build` stage that
+generates the required artifacts in the `public` directory, then
+including the `pages-deploy.yml` CI template should be sufficient:
+
+ include:
+ - project: tpo/tpa/ci-templates
+ file: pages-deploy.yml
+
GitLab pages are published under the `*.pages.torproject.org` wildcard
domain. There are two types of projects hosted at the TPO GitLab:
sub-group projects, usually under the `tpo/` super-group, and user
@@ -800,6 +808,10 @@ example the status site pipeline publishes to:
Maybe this could be abused to act as a static source in the static
mirror system?
+Update: see [service/static-shim](service/static-shim) for the chosen
+solution to deploy websites built in GitLab CI to the static mirror
+system.
+
## Issues
[File][] or [search][] for issues in the [gitlab project][search].
--
GitLab