diff options
| author | Daniel Watkins <oddbloke@ubuntu.com> | 2020-06-26 11:42:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-26 09:42:11 -0600 |
| commit | 2be12238f1c55802eb14dfc5c4523283788ef4e4 (patch) | |
| tree | 57e80dd3a72bf5b815ef7415113bf95a3d17a8af | |
| parent | 7d5b4351ccbf5c6779cf749d1bec41e9486d9f9b (diff) | |
| download | vyos-cloud-init-2be12238f1c55802eb14dfc5c4523283788ef4e4.tar.gz vyos-cloud-init-2be12238f1c55802eb14dfc5c4523283788ef4e4.zip | |
.travis.yml: rationalise installation of dependencies in host (#449)
We build in a schroot using sbuild, so we don't need Build-Depends
installed in the host; save some time (and manual maintenance when
Build-Depends change) by dropping their installation and skipping the
check for them when calling `bddeb`. We _do_ require debhelper to be
installed to build the source package, so ensure it is installed.
Additionally, while I was here, replace ubuntu-dev-tools with
devscripts; we don't need everything that ubuntu-dev-tools pulls in.
| -rw-r--r-- | .travis.yml | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 9ee23f8e..51651850 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,10 +55,7 @@ matrix: sudo find /var/snap/lxd/common/lxd/images/ -name $latest_file* -print -exec cp {} "$TRAVIS_BUILD_DIR/lxd_images/" \; install: - git fetch --unshallow - - sudo apt-get build-dep -y cloud-init - - sudo apt-get install -y --install-recommends sbuild ubuntu-dev-tools fakeroot tox - # These are build deps but not pulled in by the build-dep call above - - sudo apt-get install -y --install-recommends dh-systemd python3-coverage python3-pytest python3-pytest-cov + - sudo apt-get install -y --install-recommends sbuild devscripts fakeroot tox debhelper - pip install . - pip install tox # bionic has lxd from deb installed, remove it first to ensure @@ -75,7 +72,7 @@ matrix: - cp /usr/share/doc/sbuild/examples/example.sbuildrc /home/$USER/.sbuildrc script: # Ubuntu LTS: Build - - ./packages/bddeb -S + - ./packages/bddeb -S -d - | needs_caching=false if [ -e "$TRAVIS_BUILD_DIR/chroots/xenial-amd64.tar" ]; then |