diff options
author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-08-10 15:48:39 +0900 |
---|---|---|
committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-08-10 15:48:39 +0900 |
commit | c5fbe2a19fb8ffe8c64fc8f3810693dd3b4f7edd (patch) | |
tree | 1d5f78c08c5273eb99fd7dea0cce01e74d58cb1a /.travis.yml | |
parent | d69ffa4d93b12ddfb0d77f146921eb5d2fd62919 (diff) |
Moved options to $travis_apt_get_options
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 56c683d2aa..9de3fe7d86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,6 +49,7 @@ env: - 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: - 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: 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: - 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 \ |