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 a8acd3ade6c2c595f9cc2437f24338ce1e5de7e8..7f72e064e8f22289c2d628d1f9cacd55851b700a 100644 (file)
--- 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 5ceb7cedff812e3368350c56a554b129b9d7b36c..b0101b0f8a19509ef61b9b310cf90137e88e3c0d 100644 (file)
--- 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 8c98eb413692560fb60ad7b12e7285ad6a8a5172..51b87ce2597018437be289dfa0ada7e043ce8ff7 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1487,
 /**/
     1486,
 /**/