diff options
| author | Nick Mathewson <nickm@torproject.org> | 2023-10-17 16:03:56 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2023-10-17 16:03:56 +0000 |
| commit | 4ee335e6edf579f1e820b05ee1a342445933dbf3 (patch) | |
| tree | e4c3203eab60de36d84b7ffd19f01b123d828da2 | |
| parent | cd9263feb0c835b059058b6f6757e64706a457c7 (diff) | |
| parent | 7d209823117fe468d3e03a7ea7be5a2fd6127a81 (diff) | |
| download | torspec-4ee335e6edf579f1e820b05ee1a342445933dbf3.tar.gz torspec-4ee335e6edf579f1e820b05ee1a342445933dbf3.zip | |
Merge branch 'static-shim' into 'main'
remove duplication between check and pages, and make a build job
See merge request tpo/core/torspec!174
| -rw-r--r-- | .gitlab-ci.yml | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0d513ef..3f37e01 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,25 +1,19 @@ +--- -check: +build: # Chosen more or less arbitrarily. image: hrektts/mdbook script: - apt-get update && apt-get install -y python3 git - ./proposals/check_index - ./build_html.sh - -# TODO: -# There is way too much duplication here with "check". -# -# We should remove this once we are uploading to spec.tpo. -# -pages: - image: hrektts/mdbook - script: - - apt-get update && apt-get install -y python3 - - ./build_html.sh - mv html public artifacts: paths: - public - only: - - main + +include: + project: tpo/tpa/ci-templates + file: + #- static-shim-deploy.yml + - pages-deploy.yml |