aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-30 09:47:20 -04:00
Code Activity

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

Browse Source 
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>
This commit is contained in:
Zdenek Dohnal
2023-08-15 22:34:45 +02:00
committed by Christian Brabandt
parent 5b0889b8bf
commit ba913b14dd
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.github/workflows/ci.yml vendored
View File

@@ -180,21 +180,23 @@ jobs:
sudo usermod -a -G audio "${USER}" sudo usermod -a -G audio "${USER}"
sudo bash ci/setup-xvfb.sh 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'))) 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: env:
DEST_DIR: ${{ env.TMPDIR }}/linux-modules-extra-${{ env.LINUX_VERSION }} DEST_DIR: ${{ env.TMPDIR }}/linux-modules-extra-${{ env.LINUX_VERSION }}
run: | run: |
cd /lib/modules/${{ env.LINUX_VERSION }} 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}" 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 tar -cvC "${DEST_DIR}"/lib/modules/${{ env.LINUX_VERSION }} kernel/sound | sudo tar -x
sudo depmod --verbose sudo depmod --verbose
sudo modprobe --verbose snd-dummy sudo modprobe --verbose snd-dummy
else
echo "Module " linux-modules-extra-${{ env.LINUX_VERSION }} "doesn't seem to exist, continue anyway"; exit 0
fi
- name: Check autoconf - name: Check autoconf
if: contains(matrix.extra, 'unittests') if: contains(matrix.extra, 'unittests')

2
src/version.c
View File

@@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1713,
/**/ /**/
1712, 1712,
/**/ /**/