diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-03-26 14:04:38 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-03-26 14:04:41 -0400 |
| commit | 7f9dedb22dcd9550ca525c0e35fec38b2d59e029 (patch) | |
| tree | 1b0676319972c641199bb85b3e8ffb3423bd2d0c | |
| parent | 694f4cbd7853ffeb7b4576d42368920b0ef79b01 (diff) | |
| parent | e41e46cee0d9b98869a569b73dafc5452b4272d6 (diff) | |
Merge #18441: ci: Remove misplaced comments from folded block scalar
e41e46cee0d9b98869a569b73dafc5452b4272d6 ci: Remove misplaced comments from folded block scalar (Hennadii Stepanov)
Pull request description:
On master (f3a91ab0edc70e1bcb7e770f0878f03459c399e1) the [build log for ARM](https://travis-ci.org/github/bitcoin/bitcoin/jobs/667247758) contains:
```
$ export FILE_ENV="./ci/test/00_setup_env_arm.sh"
$ export QEMU_USER_CMD=""
$ export Can=
$ export run=
$ export the=
$ export tests=
$ export natively=
$ export without=
$ export qemu=
Setting up build cache
...
```
and
With this PR:
```
$ export FILE_ENV="./ci/test/00_setup_env_arm.sh"
$ export QEMU_USER_CMD=""
Setting up build cache
...
```
and
---
Also Travis [build config validation](https://docs.travis-ci.com/user/build-config-validation) added:
Top commit has no ACKs.
Tree-SHA512: a3ea05d543a4d46c65fffd7c67df9bbd4ca8d426fa215c5ce26653de34145edd419a54884da0416608a2c90bf5b421cab3ec32290c8916f10399354b44ddeb99
| -rw-r--r-- | .travis.yml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index e61bba4afb..1ac3b9969f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,8 @@ # [1] https://docs.travis-ci.com/user/caching/#build-phases # [2] https://docs.travis-ci.com/user/customizing-the-build#build-timeouts +version: ~> 1.0 + dist: xenial os: linux language: minimal @@ -84,19 +86,19 @@ jobs: - stage: test name: 'ARM [GOAL: install] [buster] [unit tests, functional tests]' - arch: arm64 + arch: arm64 # Can disable QEMU_USER_CMD and run the tests natively without qemu env: >- FILE_ENV="./ci/test/00_setup_env_arm.sh" - QEMU_USER_CMD="" # Can run the tests natively without qemu + QEMU_USER_CMD="" # s390 build was disabled temporarily because of disk space issues on the Travis VM # # - stage: test # name: 'S390x [GOAL: install] [buster] [unit tests, functional tests]' -# arch: s390x +# arch: s390x # Can disable QEMU_USER_CMD and run the tests natively without qemu # env: >- # FILE_ENV="./ci/test/00_setup_env_s390x.sh" -# QEMU_USER_CMD="" # Can run the tests natively without qemu +# QEMU_USER_CMD="" - stage: test name: 'Win64 [GOAL: deploy] [unit tests, no gui, no functional tests]' |