patch 9.0.1541: CI: sound dummy is disabled

Problem:    CI: sound dummy is disabled.
Solution:   Make sound dummy work again. (closes #12380)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6d50f8c1bc34953d03df416890fc8afcdef3c939..207b7dd3faf0758e2e302018dc725c8f48b85ef3 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -174,18 +174,21 @@ jobs:
           sudo usermod -a -G audio "${USER}"
           sudo bash ci/setup-xvfb.sh
 
-      # FIXME: Temporarily disabled because of build errors
-      # - name: Set up snd-dummy
-      #   if: (!(contains(matrix.extra, 'unittests') || contains(matrix.extra, 'vimtags')))
-      #   env:
-      #     DEST_DIR: ${{ env.TMPDIR }}/linux-modules-extra-${{ env.LINUX_VERSION }}
-      #   run: |
-      #     cd /lib/modules/${{ env.LINUX_VERSION }}
-      #     sudo apt-get install -d -y linux-modules-extra-${{ env.LINUX_VERSION }}
-      #     sudo dpkg -x /var/cache/apt/archives/linux-modules-extra-${{ env.LINUX_VERSION }}*.deb "${DEST_DIR}"
-      #     tar -cC "${DEST_DIR}"/lib/modules/${{ env.LINUX_VERSION }} kernel/sound | sudo tar -x
-      #     sudo depmod
-      #     sudo modprobe snd-dummy
+      - name: Set up snd-dummy
+        if: (!(contains(matrix.extra, 'unittests') || contains(matrix.extra, 'vimtags')))
+        env:
+          DEST_DIR: ${{ env.TMPDIR }}/linux-modules-extra-${{ env.LINUX_VERSION }}
+        run: |
+          cd /lib/modules/${{ env.LINUX_VERSION }}
+          if [ sudo apt-get install -d -y linux-modules-extra-${{ env.LINUX_VERSION }} 2>&1 | $(grep "Unable to locate package ") ]; then
+          echo "Download of " linux-modules-extra-${{ env.LINUX_VERSION }} "failed continue anyway" exit 0
+          else
+          sudo apt-get install -d -y linux-modules-extra-${{ env.LINUX_VERSION }}
+          sudo dpkg -x /var/cache/apt/archives/linux-modules-extra-${{ env.LINUX_VERSION }}*.deb "${DEST_DIR}"
+          tar -cvC "${DEST_DIR}"/lib/modules/${{ env.LINUX_VERSION }} kernel/sound | sudo tar -x
+          sudo depmod --verbose
+          sudo modprobe --verbose snd-dummy
+          fi
 
       - name: Check autoconf
         if: contains(matrix.extra, 'unittests')

diff --git a/src/version.c b/src/version.c
index e5f4afa70a04fd110f0632334d4960e0670118fd..c917be5fbd347301ac35f8b3171d91c0236f8831 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1541,
 /**/
     1540,
 /**/