packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

travis: Update to Debian Stretch 

Update to Stretch to use updated version of glib2.0. Fixes CI
failure when parsing error output in tests/test-config.sh. See:

https://github.com/ostreedev/ostree/pull/1838#issuecomment-482186680
https://api.travis-ci.org/v3/job/518830164/log.txt

Closes: #1839
Approved by: cgwalters
This commit is contained in:
Robert Fairley 2019-04-12 12:10:41 -04:00 committed by Atomic Bot
parent 298c601d88
commit 95d6701fb9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -4,8 +4,8 @@ sudo: required
env: env:
- ci_distro=ubuntu ci_suite=trusty ci_test=no # TODO: use libcurl on this - ci_distro=ubuntu ci_suite=trusty ci_test=no # TODO: use libcurl on this
- ci_docker=debian:jessie-slim ci_distro=debian ci_suite=jessie - ci_docker=debian:stretch-slim ci_distro=debian ci_suite=stretch
- ci_docker=debian:jessie-slim ci_distro=debian ci_suite=jessie ci_configopts="--with-curl" - ci_docker=debian:stretch-slim ci_distro=debian ci_suite=stretch ci_configopts="--with-curl"
- ci_docker=debian:stretch-slim ci_distro=debian ci_suite=stretch ci_test=no # TODO gpgme flake https://github.com/ostreedev/ostree/pull/664#issuecomment-276033383 - ci_docker=debian:stretch-slim ci_distro=debian ci_suite=stretch ci_test=no # TODO gpgme flake https://github.com/ostreedev/ostree/pull/664#issuecomment-276033383
- ci_docker=ubuntu:xenial ci_distro=ubuntu ci_suite=xenial - ci_docker=ubuntu:xenial ci_distro=ubuntu ci_suite=xenial

2
ci/travis-install.sh
View File

@ -48,7 +48,7 @@ NULL=
# Typical values for ci_distro=ubuntu: xenial, trusty # Typical values for ci_distro=ubuntu: xenial, trusty
# Typical values for ci_distro=debian: sid, jessie # Typical values for ci_distro=debian: sid, jessie
# Typical values for ci_distro=fedora might be 25, rawhide # Typical values for ci_distro=fedora might be 25, rawhide
: "${ci_suite:=jessie}" : "${ci_suite:=stretch}"
# ci_configopts: Additional arguments for configure # ci_configopts: Additional arguments for configure
: "${ci_configopts:=}" : "${ci_configopts:=}"