diff options
| author | Nick Mathewson <nickm@torproject.org> | 2023-10-17 18:32:18 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2023-10-17 18:32:18 +0000 |
| commit | 8bd6bb7717a2a5c41292ef54e2610dab3497a1d8 (patch) | |
| tree | 859635de320b85a22015580960b307e6331ed673 | |
| parent | 4ee335e6edf579f1e820b05ee1a342445933dbf3 (diff) | |
| parent | 683d8ca198b187ba9a42a8f074308d5cc88b40be (diff) | |
| download | torspec-8bd6bb7717a2a5c41292ef54e2610dab3497a1d8.tar.gz torspec-8bd6bb7717a2a5c41292ef54e2610dab3497a1d8.zip | |
Merge branch 'static-shim' into 'main'
deploy to static-shim (tpo/tpa/team#41348)
See merge request tpo/core/torspec!175
| -rw-r--r-- | .gitlab-ci.yml | 12 |
1 files changed, 11 insertions, 1 deletions
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"' |