diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-08-19 19:46:12 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-08-19 19:46:12 +0200 |
| commit | a7c4e747639ad7642cd50ed577ff4c93db200df4 (patch) | |
| tree | 085a5afe56c73e625d39b1e7d0da36680a95401c | |
| parent | f8abbf37d66c41d980284e28e0e38a399890e918 (diff) | |
patch 8.2.1487: Travis: installing snd-dummy is not always usefulv8.2.1487
Problem: Travis: installing snd-dummy is not always useful.
Solution: Only install snd-dummy on amd64. (Ozaki Kiichi, closes #6738)
| -rw-r--r-- | .travis.yml | 20 | ||||
| -rw-r--r-- | ci/load-snd-dummy.sh | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 15 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index a8acd3ade6..7f72e064e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,7 +69,11 @@ _anchors: fi before_script: - sudo sysctl -w net.ipv6.conf.lo.disable_ipv6=0 - - sudo bash ci/load-snd-dummy.sh || true + # It appears we can load "snd-dummy" on only amd64. + - | + if [[ "${TRAVIS_CPU_ARCH}" = amd64 ]]; then + sudo bash ci/load-snd-dummy.sh || true + fi - sudo usermod -a -G audio $USER - do_test() { sg audio "sg $(id -gn) '$*'"; } @@ -208,13 +212,13 @@ jobs: env: - *normal - *shadowopt - # Temporarily disabled, always fails - #- <<: *linux - # arch: s390x - # name: huge/gcc-s390x - # compiler: gcc - # env: *linux-huge - # services: [] + # Temporarily disabled, always fails + #- <<: *linux + # arch: s390x + # name: huge/gcc-s390x + # compiler: gcc + # env: *linux-huge + # services: [] - <<: *linux arch: arm64 name: huge/gcc-arm64 diff --git a/ci/load-snd-dummy.sh b/ci/load-snd-dummy.sh index 5ceb7cedff..b0101b0f8a 100644 --- a/ci/load-snd-dummy.sh +++ b/ci/load-snd-dummy.sh @@ -3,6 +3,6 @@ set -e if ! modprobe snd-dummy; then # snd-dummy is contained in linux-modules-extra (if exists) - apt install -y "linux-modules-extra-$(uname -r)" + apt-get install -yq --no-install-suggests --no-install-recommends "linux-modules-extra-$(uname -r)" modprobe snd-dummy fi diff --git a/src/version.c b/src/version.c index 8c98eb4136..51b87ce259 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1487, +/**/ 1486, /**/ 1485, |