From 683d8ca198b187ba9a42a8f074308d5cc88b40be Mon Sep 17 00:00:00 2001 From: Antoine Beaupré Date: Tue, 17 Oct 2023 14:25:00 -0400 Subject: deploy to static-shim (tpo/tpa/team#41348) This makes GitLab CI try to push the site to the static-shim server. This will should succeed, because we have added the key in Puppet, but will ultimately fail to deploy because the static component hasn't been setup properly yet. We're hoping to setup review apps so that we can see a real version of this before switching off the old spec.tpo. --- .gitlab-ci.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3f37e01..31fb80f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,6 @@ --- +variables: + SITE_URL: spec.torproject.org build: # Chosen more or less arbitrarily. @@ -15,5 +17,13 @@ build: include: project: tpo/tpa/ci-templates file: - #- static-shim-deploy.yml + - static-shim-deploy.yml - pages-deploy.yml + +# use pages for merge requests, not main (which is the default in the +# above template). the logic here is that we want people that do not +# have acess to the repository to still have a preview of their merge +# request. +pages: + rules: + - if: '$CI_PIPELINE_SOURCE == "merge_request"' -- cgit v1.2.3-54-g00ecf