diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-08-12 12:29:17 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-08-12 12:29:17 -0400 |
| commit | 02bb719a9494a010b3cad4cf81942ec7619f5806 (patch) | |
| tree | 6ca56f03968e102fe319bbfa7b1057715c6742e0 /.gitlab-ci.yml | |
| parent | 6ef40144ae7777acdf13126d61c2686cc470b6c5 (diff) | |
| parent | f5b94715479e9b7bef5675ab72c8b2e260bcb830 (diff) | |
| download | tor-02bb719a9494a010b3cad4cf81942ec7619f5806.tar.gz tor-02bb719a9494a010b3cad4cf81942ec7619f5806.zip | |
Merge branch 'maint-0.3.5' into maint-0.4.2
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 36 |
1 files changed, 26 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index abc5003678..8ed615687b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -66,6 +66,7 @@ variables: - apt-get install automake build-essential + ca-certificates git libevent-dev liblzma-dev @@ -77,6 +78,10 @@ variables: zlib1g-dev - if [ "$ASCIIDOC" = yes ]; then apt-get install asciidoc xmlto; fi - if [ "$DOXYGEN" = yes ]; then apt-get install doxygen; fi + - if [ "$STEM" = yes ]; then apt-get install timelimit; fi + - if [ "$CC" = clang ]; then apt-get install clang; fi + - if [ "$STEM" = yes ]; then git clone --depth 1 https://git.torproject.org/stem.git ; export STEM_PATH="$(pwd)/stem"; fi + - if [ "$CHUTNEY" = yes ]; then git clone --depth 1 https://git.torproject.org/chutney.git ; export CHUTNEY_PATH="$(pwd)/chutney"; fi debian-minimal: image: debian:stable @@ -84,17 +89,18 @@ debian-minimal: script: - ./scripts/ci/ci-driver.sh -############################################### -# Temporarily diabled. This one just takes too long to finish right now! + +# TODO: This one just takes too long to finish right now! # Maybe we need to divide the call to ./src/test/test into a few segments, # that all end in similar amount of time? -#debian-hardened: -# image: debian:testing -# <<: *debian-template -# variables: -# HARDENING: "yes" -# script: -# - ./scripts/ci/ci-driver.sh +debian-hardened: + image: debian:testing + <<: *debian-template + variables: + HARDENING: "yes" + CC: "clang" + script: + - ./scripts/ci/ci-driver.sh debian-distcheck: image: debian:stable @@ -105,7 +111,6 @@ debian-distcheck: script: - ./scripts/ci/ci-driver.sh -# TODO: it would be neat to disable the "make all" part of this one. debian-docs: image: debian:stable <<: *debian-template @@ -113,5 +118,16 @@ debian-docs: DOXYGEN: "yes" ASCIIDOC: "yes" CHECK: "no" + RUN_STAGE_BUILD: "no" + script: + - ./scripts/ci/ci-driver.sh + +debian-integration: + image: debian:stable + <<: *debian-template + variables: + CHECK: "no" + CHUTNEY: "yes" + # STEM: "yes" -- currently failing on <044. script: - ./scripts/ci/ci-driver.sh |