patch 9.0.1733: CI: cannot cache linux-modules-extra

Commit: 
https://github.com/vim/vim/commit/d2af6c66fe9b6bbb58d6ffdf8b3aa6e57d993b1f
Author: Philip H <[email protected]>
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 <[email protected]>
    Co-authored-by: Philip H <[email protected]>

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e5715d3af..12bab27cc 100644
--- 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
-        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 dd8491b6d..539b3899a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1733,
 /**/
     1732,
 /**/

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups 
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To view this discussion on the web visit 
https://groups.google.com/d/msgid/vim_dev/E1qWl2B-006dmm-RL%40256bit.org.

Raspunde prin e-mail lui