mirror of
https://github.com/vim/vim
synced 2025-07-16 01:01:58 +00:00
patch 8.2.1487: Travis: installing snd-dummy is not always useful
Problem: Travis: installing snd-dummy is not always useful. Solution: Only install snd-dummy on amd64. (Ozaki Kiichi, closes #6738)
This commit is contained in:
20
.travis.yml
20
.travis.yml
@ -69,7 +69,11 @@ _anchors:
|
|||||||
fi
|
fi
|
||||||
before_script:
|
before_script:
|
||||||
- sudo sysctl -w net.ipv6.conf.lo.disable_ipv6=0
|
- 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
|
- sudo usermod -a -G audio $USER
|
||||||
- do_test() { sg audio "sg $(id -gn) '$*'"; }
|
- do_test() { sg audio "sg $(id -gn) '$*'"; }
|
||||||
|
|
||||||
@ -208,13 +212,13 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
- *normal
|
- *normal
|
||||||
- *shadowopt
|
- *shadowopt
|
||||||
# Temporarily disabled, always fails
|
# Temporarily disabled, always fails
|
||||||
#- <<: *linux
|
#- <<: *linux
|
||||||
# arch: s390x
|
# arch: s390x
|
||||||
# name: huge/gcc-s390x
|
# name: huge/gcc-s390x
|
||||||
# compiler: gcc
|
# compiler: gcc
|
||||||
# env: *linux-huge
|
# env: *linux-huge
|
||||||
# services: []
|
# services: []
|
||||||
- <<: *linux
|
- <<: *linux
|
||||||
arch: arm64
|
arch: arm64
|
||||||
name: huge/gcc-arm64
|
name: huge/gcc-arm64
|
||||||
|
@ -3,6 +3,6 @@ set -e
|
|||||||
|
|
||||||
if ! modprobe snd-dummy; then
|
if ! modprobe snd-dummy; then
|
||||||
# snd-dummy is contained in linux-modules-extra (if exists)
|
# 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
|
modprobe snd-dummy
|
||||||
fi
|
fi
|
||||||
|
@ -754,6 +754,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1487,
|
||||||
/**/
|
/**/
|
||||||
1486,
|
1486,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user