Unverified Commit 1eb57b20 authored by teor's avatar teor
Browse files

Merge branch 'ticket31919_bionic_029' into ticket31919_bionic_035

parents d175e708 8e549dd5
...@@ -45,6 +45,14 @@ matrix: ...@@ -45,6 +45,14 @@ matrix:
compiler: clang compiler: clang
## We run chutney on Linux, because it's faster than chutney on macOS ## We run chutney on Linux, because it's faster than chutney on macOS
- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes"
## (Linux only) Use an older Linux image (Ubuntu Trusty)
## The Xenial and Bionic images cause permissions issues for chutney,
## this is a workaround, until we fix #32240.
dist: trusty
## We check asciidoc with distcheck, to make sure we remove doc products
## We use Linux clang, because there are no other Linux clang jobs
- env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes"
compiler: clang
## We include a single coverage build with the best options for coverage ## We include a single coverage build with the best options for coverage
- env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS=""
## We run rust on Linux, because it's faster than rust on macOS ## We run rust on Linux, because it's faster than rust on macOS
...@@ -84,8 +92,8 @@ matrix: ...@@ -84,8 +92,8 @@ matrix:
## test-stem sometimes hangs on Travis ## test-stem sometimes hangs on Travis
- env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes" - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes"
## (Linux only) Use the latest Linux image (Ubuntu Trusty) ## (Linux only) Use a recent Linux image (Ubuntu Bionic)
dist: trusty dist: bionic
## Download our dependencies ## Download our dependencies
addons: addons:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment