diff options
| author | Zdenek Dohnal <zdohnal@redhat.com> | 2023-08-15 22:34:45 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2023-08-15 22:34:45 +0200 |
| commit | ba913b14dde28f1f49b73a15f0a75038e12fde27 (patch) | |
| tree | 7aeb6ebdd719899566a5d9ea8646c2930ad59606 | |
| parent | 5b0889b8bf25b0793b1949ec965c94b623900aba (diff) | |
patch 9.0.1713: Github CI fails to load snd-dummy kernel modulev9.0.1713
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>
| -rw-r--r-- | .github/workflows/ci.yml | 16 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 11 insertions, 7 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 104476b454..e5715d3afe 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 45f5527d19..15e692dd5e 100644 --- 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, |