changeset 21875:3a7017ee1161 v8.2.1487

patch 8.2.1487: Travis: installing snd-dummy is not always useful Commit: https://github.com/vim/vim/commit/a7c4e747639ad7642cd50ed577ff4c93db200df4 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Aug 19 19:46:12 2020 +0200 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 https://github.com/vim/vim/issues/6738)
author Bram Moolenaar <Bram@vim.org>
date Wed, 19 Aug 2020 20:00:06 +0200
parents 9dc25fc65089
children 43877f9603c1
files .travis.yml ci/load-snd-dummy.sh src/version.c
diffstat 3 files changed, 15 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/.travis.yml
+++ b/.travis.yml
@@ -69,7 +69,11 @@ env:
         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
--- 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
--- 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,