diff options
| author | David Goulet <dgoulet@torproject.org> | 2021-09-13 13:34:48 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2021-09-13 13:34:48 -0400 |
| commit | 7440a38846d78c2b9040f117fdc4b823cdee4a27 (patch) | |
| tree | c9ed8c7066687c7abbb7e0eca959a2e0a8eeca97 | |
| parent | eac7bdce91f1ab341d801cc2f317dd408ed85cb4 (diff) | |
| parent | f728e09ebe611d6858e721eaa37637025bfbf259 (diff) | |
| download | tor-7440a38846d78c2b9040f117fdc4b823cdee4a27.tar.gz tor-7440a38846d78c2b9040f117fdc4b823cdee4a27.zip | |
Merge branch 'maint-0.4.6'
| -rw-r--r-- | .gitlab-ci.yml | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f7abf8362e..fa29c65c58 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,6 +37,12 @@ variables: paths: - artifacts/ + +# This template is used for x86-64 builds. +.x86-64-template: &x86-64-template + tags: + - amd64 + # This template should be usable on any system that's based on apt. .apt-template: &apt-template | export LC_ALL=C.UTF-8 @@ -57,6 +63,7 @@ variables: # This template sets us up for Debian system in particular. .debian-template: &debian-template <<: *artifacts-template + <<: *x86-64-template variables: DEBIAN_FRONTEND: "noninteractive" # TODO: Using "cache" in this way speeds up our downloads. It would be @@ -110,7 +117,7 @@ debian-minimal: # # TODO: This will be faster once we merge #40098 and #40099. debian-hardened: - image: debian:testing + image: debian:bullseye <<: *debian-template variables: ALL_BUGS_ARE_FATAL: "yes" |