ruby-changes:56907
From: Nobuyoshi <ko1@a...>
Date: Sat, 10 Aug 2019 16:28:38 +0900 (JST)
Subject: [ruby-changes:56907] Nobuyoshi Nakada: c5fbe2a19f (master): Moved options to $travis_apt_get_options
https://git.ruby-lang.org/ruby.git/commit/?id=c5fbe2a19f From c5fbe2a19fb8ffe8c64fc8f3810693dd3b4f7edd Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Sat, 10 Aug 2019 15:48:39 +0900 Subject: Moved options to $travis_apt_get_options diff --git a/.travis.yml b/.travis.yml index 56c683d..9de3fe7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,6 +49,7 @@ env: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L49 - UPDATE_UNICODE="UNICODE_FILES=. UNICODE_PROPERTY_FILES=. UNICODE_AUXILIARY_FILES=. UNICODE_EMOJI_FILES=." # https://github.com/travis-ci/travis-build/blob/e411371dda21430a60f61b8f3f57943d2fe4d344/lib/travis/build/bash/travis_apt_get_options.bash#L7 - travis_apt_get_options='--allow-downgrades --allow-remove-essential --allow-change-held-packages' + - travis_apt_get_options="-yq --no-install-suggests --no-install-recommends $travis_apt_get_options" .org.ruby-lang.ci.matrix-definitions: @@ -91,7 +92,7 @@ env: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L92 - tool/travis_retry.sh sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test" - tool/travis_retry.sh bash -c "sudo rm -rf '${TRAVIS_ROOT}/var/lib/apt/lists/'* && sudo apt-get update -yq" - |- - tool/travis_retry.sh sudo -E apt-get -yq --no-install-suggests --no-install-recommends $travis_apt_get_options install \ + tool/travis_retry.sh sudo -E apt-get $travis_apt_get_options install \ gcc-8 \ libffi-dev \ libgdbm-dev \ @@ -118,7 +119,7 @@ env: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L119 before_install: - tool/travis_retry.sh bash -c "sudo rm -rf '${TRAVIS_ROOT}/var/lib/apt/lists/'* && sudo apt-get update -yq" - |- - tool/travis_retry.sh sudo -E apt-get -yq --no-install-suggests --no-install-recommends $travis_apt_get_options install \ + tool/travis_retry.sh sudo -E apt-get $travis_apt_get_options install \ clang-8 \ llvm-8-tools \ libffi-dev \ @@ -277,7 +278,7 @@ env: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L278 - tool/travis_retry.sh sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test" - tool/travis_retry.sh bash -c "sudo rm -rf '${TRAVIS_ROOT}/var/lib/apt/lists/'* && sudo apt-get update -yq" - |- - tool/travis_retry.sh sudo -E apt-get -yq --no-install-suggests --no-install-recommends $travis_apt_get_options install \ + tool/travis_retry.sh sudo -E apt-get $travis_apt_get_options install \ gcc-8-multilib \ libffi-dev:i386 \ libffi6:i386 \ -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/