Skip to content

Commit aa9429a

Browse files
author
MarcoFalke
committed
Merge #13729: travis: Avoid unnecessarily setting env variables on the lint build
751c958 Use the Travis python language feature on the lint build (Ben Woosley) 515348f Don't unnecessarily install shellcheck on the lint build (Ben Woosley) 1be5c33 Avoid unnecessarily setting env variables on the lint build (Ben Woosley) Pull request description: The relevent env variables are set for the matrix builds, and are irrelevant to the lint build. By default the first matrix entry is applied. "Each job included in jobs.include inherits the first value of the array that defines a matrix dimension." https://docs.travis-ci.com/user/build-stages/#Build-Stages-and-Build-Matrix-Expansion Note the global env variables are still applied, just the matrix are excluded: https://travis-ci.org/bitcoin/bitcoin/jobs/406455565#L558 Before: <img width="755" alt="screen shot 2018-07-20 at 19 16 45" src="https://user-images.githubusercontent.com/5470/43029041-81e5fd14-8c51-11e8-9e2a-6c4bcbb36d2c.png"> After: <img width="702" alt="screen shot 2018-07-20 at 19 23 05" src="https://user-images.githubusercontent.com/5470/43029187-5ec76b28-8c52-11e8-8b03-5bee859c0d96.png"> Tree-SHA512: 93bdf4da81e150d3eb90be1d94c4e9e90a5b38286049ffdad25036cbe6357409466e52ff4cb7f69f51af706119a6a9bfa595e8c240056bcfc0e1d0d898fd3178
2 parents e8c7434 + 751c958 commit aa9429a

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

.travis.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,13 @@ after_script:
8181
jobs:
8282
include:
8383
- stage: lint
84+
env:
8485
sudo: false
8586
cache: false
86-
addons:
87-
apt:
88-
packages:
89-
- python3-pip
90-
- shellcheck
87+
language: python
88+
python: '3.6'
9189
install:
92-
- travis_retry pip3 install flake8 --user
90+
- travis_retry pip install flake8
9391
before_script:
9492
- git fetch --unshallow
9593
script:

0 commit comments

Comments
 (0)