patch 9.0.1733: CI: cannot cache linux-modules-extra
Problem: CI: cannot cache linux-modules-extra
Solution: Enable caching and reduce failed downloads
closes: #12779
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Philip H <47042125+pheiduck@users.noreply.github.com>
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e5715d3..12bab27 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -180,23 +180,20 @@
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: steps.check-snd-dummy.outcome == 'success' && (!(contains(matrix.extra, 'unittests') || contains(matrix.extra, 'vimtags')))
+ if: (!(contains(matrix.extra, 'unittests') || contains(matrix.extra, 'vimtags')))
env:
DEST_DIR: ${{ env.TMPDIR }}/linux-modules-extra-${{ env.LINUX_VERSION }}
+ uses: tecolicom/actions-use-apt-tools@main
+ with:
+ tools: linux-modules-extra-${{ env.LINUX_VERSION }}
+ path: "${DEST_DIR}"
+
+ - name: modprobe snd-dummy
+ if: (!(contains(matrix.extra, 'unittests') || contains(matrix.extra, 'vimtags')))
run: |
- cd /lib/modules/${{ 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
+ sudo modprobe --verbose snd-dummy
- name: Check autoconf
if: contains(matrix.extra, 'unittests')
diff --git a/src/version.c b/src/version.c
index dd8491b..539b389 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1733,
+/**/
1732,
/**/
1731,