From 95d6701fb9c4f7cfe152b8f5f2f47f8c0ba81402 Mon Sep 17 00:00:00 2001 From: Robert Fairley Date: Fri, 12 Apr 2019 12:10:41 -0400 Subject: [PATCH] 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 --- .travis.yml | 4 ++-- ci/travis-install.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 140e7ada..c2342b0f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,8 @@ sudo: required env: - 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:jessie-slim ci_distro=debian ci_suite=jessie ci_configopts="--with-curl" + - ci_docker=debian:stretch-slim ci_distro=debian ci_suite=stretch + - 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=ubuntu:xenial ci_distro=ubuntu ci_suite=xenial diff --git a/ci/travis-install.sh b/ci/travis-install.sh index 8dd373d3..8992aed0 100755 --- a/ci/travis-install.sh +++ b/ci/travis-install.sh @@ -48,7 +48,7 @@ NULL= # Typical values for ci_distro=ubuntu: xenial, trusty # Typical values for ci_distro=debian: sid, jessie # Typical values for ci_distro=fedora might be 25, rawhide -: "${ci_suite:=jessie}" +: "${ci_suite:=stretch}" # ci_configopts: Additional arguments for configure : "${ci_configopts:=}"