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)
diff --git a/.travis.yml b/.travis.yml
index a8acd3a..7f72e06 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -69,7 +69,11 @@
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 @@
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 5ceb7ce..b0101b0 100644
--- a/ci/load-snd-dummy.sh
+++ b/ci/load-snd-dummy.sh
@@ -3,6 +3,6 @@
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 8c98eb4..51b87ce 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1487,
+/**/
1486,
/**/
1485,