Mercurial > vim

changeset 32794:d8d28ab976a0 v9.0.1713

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.1713: Github CI fails to load snd-dummy kernel module Commit: https://github.com/vim/vim/commit/ba913b14dde28f1f49b73a15f0a75038e12fde27 Author: Zdenek Dohnal <zdohnal@redhat.com> 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 <cb@256bit.org> Co-authored-by: Zdenek Dohnal <zdohnal@redhat.com>
author Christian Brabandt <cb@256bit.org>
date Tue, 15 Aug 2023 22:45:03 +0200
parents c91d6b0a4d0f
children 4e591c4c4fe7
files .github/workflows/ci.yml src/version.c
diffstat 2 files changed, 11 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- 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: 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: (!(contains(matrix.extra, 'unittests') || contains(matrix.extra, 'vimtags')))
+        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')
--- 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 */
 /**/
+    1713,
+/**/
     1712,
 /**/
     1711,