Patch 8.2.1487

[Bram Moolenaar]

Patch 8.2.1487
Problem: Travis: installing snd-dummy is not always useful.
Solution: Only install snd-dummy on amd64. (Ozaki Kiichi, closes #6738)
Files: .travis.yml, ci/load-snd-dummy.sh


*** ../vim-8.2.1486/.travis.yml 2020-08-13 18:57:56.554214765 +0200
--- .travis.yml 2020-08-19 19:43:53.140467483 +0200
***************
*** 69,75 ****
fi
before_script:
- sudo sysctl -w net.ipv6.conf.lo.disable_ipv6=0
! - sudo bash ci/load-snd-dummy.sh || true
- sudo usermod -a -G audio $USER
- do_test() { sg audio "sg $(id -gn) '$*'"; }

--- 69,79 ----
fi
before_script:
- sudo sysctl -w net.ipv6.conf.lo.disable_ipv6=0
! # 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,220 ****
env:
- *normal
- *shadowopt
! # Temporarily disabled, always fails
! #- <<: *linux
! # arch: s390x
! # name: huge/gcc-s390x
! # compiler: gcc
! # env: *linux-huge
! # services: []
- <<: *linux
arch: arm64
name: huge/gcc-arm64
--- 212,224 ----
env:
- *normal
- *shadowopt
! # Temporarily disabled, always fails
! #- <<: *linux
! # arch: s390x
! # name: huge/gcc-s390x
! # compiler: gcc
! # env: *linux-huge
! # services: []
- <<: *linux
arch: arm64
name: huge/gcc-arm64
*** ../vim-8.2.1486/ci/load-snd-dummy.sh 2020-03-20 18:11:15.778980169 +0100
--- ci/load-snd-dummy.sh 2020-08-19 19:43:53.140467483 +0200
***************
*** 3,8 ****

if ! modprobe snd-dummy; then
# snd-dummy is contained in linux-modules-extra (if exists)
! apt install -y "linux-modules-extra-$(uname -r)"
modprobe snd-dummy
fi
--- 3,8 ----

if ! modprobe snd-dummy; then
# snd-dummy is contained in linux-modules-extra (if exists)
! apt-get install -yq --no-install-suggests --no-install-recommends "linux-modules-extra-$(uname -r)"
modprobe snd-dummy
fi
*** ../vim-8.2.1486/src/version.c 2020-08-19 16:00:02.086372657 +0200
--- src/version.c 2020-08-19 19:45:44.363680435 +0200
***************
*** 756,757 ****
--- 756,759 ----
{ /* Add new patch number below this line */
+ /**/
+ 1487,
/**/

--
Eagles may soar, but weasels don't get sucked into jet engines.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///