commit ef06ef217a828e3c34358bc53da41932bc129017 Merge: 9242f3288 3fa42d599 Author: teor teor@torproject.org Date: Thu Apr 4 13:23:26 2019 +1000
Merge branch 'bug30011_035' into bug30011_040
Merge bug30011 new package timelimit with 0.4.0 new package shellcheck. Move shellcheck into the correct category.
.travis.yml | 13 ++++++++++--- changes/bug30011 | 4 ++++ 2 files changed, 14 insertions(+), 3 deletions(-)
diff --cc .travis.yml index 474f6867f,e70344ee2..498069d82 --- a/.travis.yml +++ b/.travis.yml @@@ -125,6 -125,6 +125,7 @@@ addons - libseccomp-dev ## zstd doesn't exist in Ubuntu Trusty #- libzstd ++ - shellcheck ## Conditional build dependencies ## Always installed, so we don't need sudo - asciidoc @@@ -151,6 -153,6 +154,7 @@@ - pkg-config ## Optional build dependencies - ccache ++ - shellcheck ## Conditional build dependencies ## Always installed, because manual brew installs are hard to get right - asciidoc