diff options
| author | David Goulet <dgoulet@torproject.org> | 2021-09-13 13:34:44 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2021-09-13 13:34:44 -0400 |
| commit | 0dbb2f53b933cb089ed18d72717bbf10938ffa76 (patch) | |
| tree | 21c1b064a4268e4ba589e4cd0710ac3d93997983 /.gitlab-ci.yml | |
| parent | da9ff3936d71a607a7af5b07f87d18a4aa303060 (diff) | |
| parent | fcef8e3f75cf39ae7eb6195713d4855b4fc4d08c (diff) | |
| download | tor-0dbb2f53b933cb089ed18d72717bbf10938ffa76.tar.gz tor-0dbb2f53b933cb089ed18d72717bbf10938ffa76.zip | |
Merge branch 'maint-0.3.5' into maint-0.4.5
Diffstat (limited to '.gitlab-ci.yml')
| -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" |