changeset 32842:bb24afd68742 v9.0.1733

patch 9.0.1733: CI: cannot cache linux-modules-extra Commit: https://github.com/vim/vim/commit/d2af6c66fe9b6bbb58d6ffdf8b3aa6e57d993b1f Author: Philip H <47042125+pheiduck@users.noreply.github.com> Date: Thu Aug 17 23:45:08 2023 +0200 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>
author Christian Brabandt <cb@256bit.org>
date Fri, 18 Aug 2023 00:00:03 +0200
parents f08bd477de70
children 2066721afa0e
files .github/workflows/ci.yml src/version.c
diffstat 2 files changed, 11 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -180,23 +180,20 @@ 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
+      - name: Set up 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 }}
+        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')
--- 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 */
 /**/
+    1733,
+/**/
     1732,
 /**/
     1731,