Skip to content

Commit 7f9dedb

Browse files
author
MarcoFalke
committed
Merge bitcoin#18441: ci: Remove misplaced comments from folded block scalar
e41e46c ci: Remove misplaced comments from folded block scalar (Hennadii Stepanov) Pull request description: On master (f3a91ab) 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 ![Screenshot from 2020-03-26 18-58-50](https://user-images.githubusercontent.com/32963518/77674223-e28d2d00-6f93-11ea-82a1-7f805ccb678d.png) With this PR: ``` $ export FILE_ENV="./ci/test/00_setup_env_arm.sh" $ export QEMU_USER_CMD="" Setting up build cache ... ``` and ![Screenshot from 2020-03-26 19-01-56](https://user-images.githubusercontent.com/32963518/77674456-4d3e6880-6f94-11ea-9c83-546c81f1cdf7.png) --- Also Travis [build config validation](https://docs.travis-ci.com/user/build-config-validation) added: ![Screenshot from 2020-03-26 19-04-19](https://user-images.githubusercontent.com/32963518/77674686-9ee6f300-6f94-11ea-900f-fdef8a673113.png) Top commit has no ACKs. Tree-SHA512: a3ea05d543a4d46c65fffd7c67df9bbd4ca8d426fa215c5ce26653de34145edd419a54884da0416608a2c90bf5b421cab3ec32290c8916f10399354b44ddeb99
2 parents 694f4cb + e41e46c commit 7f9dedb

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

.travis.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
# [1] https://docs.travis-ci.com/user/caching/#build-phases
2626
# [2] https://docs.travis-ci.com/user/customizing-the-build#build-timeouts
2727

28+
version: ~> 1.0
29+
2830
dist: xenial
2931
os: linux
3032
language: minimal
@@ -84,19 +86,19 @@ jobs:
8486

8587
- stage: test
8688
name: 'ARM [GOAL: install] [buster] [unit tests, functional tests]'
87-
arch: arm64
89+
arch: arm64 # Can disable QEMU_USER_CMD and run the tests natively without qemu
8890
env: >-
8991
FILE_ENV="./ci/test/00_setup_env_arm.sh"
90-
QEMU_USER_CMD="" # Can run the tests natively without qemu
92+
QEMU_USER_CMD=""
9193
9294
# s390 build was disabled temporarily because of disk space issues on the Travis VM
9395
#
9496
# - stage: test
9597
# name: 'S390x [GOAL: install] [buster] [unit tests, functional tests]'
96-
# arch: s390x
98+
# arch: s390x # Can disable QEMU_USER_CMD and run the tests natively without qemu
9799
# env: >-
98100
# FILE_ENV="./ci/test/00_setup_env_s390x.sh"
99-
# QEMU_USER_CMD="" # Can run the tests natively without qemu
101+
# QEMU_USER_CMD=""
100102

101103
- stage: test
102104
name: 'Win64 [GOAL: deploy] [unit tests, no gui, no functional tests]'

0 commit comments

Comments
 (0)