changeset 32419:60f1be8d0dca v9.0.1541

patch 9.0.1541: CI: sound dummy is disabled Commit: https://github.com/vim/vim/commit/e741f039cf46ccfbdaaa274618810787129d152b Author: Philip H <47042125+pheiduck@users.noreply.github.com> Date: Thu May 11 15:22:58 2023 +0100 patch 9.0.1541: CI: sound dummy is disabled Problem: CI: sound dummy is disabled. Solution: Make sound dummy work again. (closes https://github.com/vim/vim/issues/12380)
author Bram Moolenaar <Bram@vim.org>
date Thu, 11 May 2023 16:30:04 +0200
parents c1d35017c56e
children c18c96fd52bf
files .github/workflows/ci.yml src/version.c
diffstat 2 files changed, 17 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- 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')
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1541,
+/**/
     1540,
 /**/
     1539,