patch 9.0.1713: Github CI fails to load snd-dummy kernel module

Commit: 
https://github.com/vim/vim/commit/ba913b14dde28f1f49b73a15f0a75038e12fde27
Author: Zdenek Dohnal <[email protected]>
Date:   Tue Aug 15 22:34:45 2023 +0200

    patch 9.0.1713: Github CI fails to load snd-dummy kernel module
    
    Problem: Github CI fails to load snd-dummy kernel module
    Solution: Make installation of linux-modules-extra optional
    
    linux-modules-extra package are not available on Ubuntu 22 at the
    moment, which breaks CI runs. The change make its installation
    conditional as the original `if-else` structure tried to do.
    
    closes: #12801
    
    Signed-off-by: Christian Brabandt <[email protected]>
    Co-authored-by: Zdenek Dohnal <[email protected]>

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 104476b45..e5715d3af 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -180,21 +180,23 @@ jobs:
           sudo usermod -a -G audio "${USER}"
           sudo bash ci/setup-xvfb.sh
 
-      - name: Set up snd-dummy
+      - name: Check if linux-modules-extra is available
+        id: check-snd-dummy
         if: (!(contains(matrix.extra, 'unittests') || contains(matrix.extra, 
'vimtags')))
+        continue-on-error: true
+        run: |
+          sudo apt-get install -d -y linux-modules-extra-${{ env.LINUX_VERSION 
}}
+
+      - name: Set up snd-dummy
+        if: steps.check-snd-dummy.outcome == 'success' && 
(!(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 apt-cache show linux-modules-extra-${{ env.LINUX_VERSION }} 
>/dev/null 2>&1 ; then
-          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
-          else
-          echo "Module " linux-modules-extra-${{ env.LINUX_VERSION }} "doesn't 
seem to exist, continue anyway"; exit 0
-          fi
+          sudo modprobe --verbose snd-dummy 
 
       - name: Check autoconf
         if: contains(matrix.extra, 'unittests')
diff --git a/src/version.c b/src/version.c
index 45f5527d1..15e692dd5 100644
--- 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 */
+/**/
+    1713,
 /**/
     1712,
 /**/

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups 
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To view this discussion on the web visit 
https://groups.google.com/d/msgid/vim_dev/E1qW0uV-003ZyV-PH%40256bit.org.

Raspunde prin e-mail lui