changeset 32433:151dbe17df6c v9.0.1548

patch 9.0.1548: CI: check in sound-dummy module may throw an error Commit: https://github.com/vim/vim/commit/ff40b625a693cf5094abe76b77655f13ad48739b Author: Christian Brabandt <cb@256bit.org> Date: Sat May 13 11:54:47 2023 +0100 patch 9.0.1548: CI: check in sound-dummy module may throw an error Problem: CI: check in sound-dummy module may throw an error. Solution: Check whether apt-cache can show the package description. (Christian Brabandt, closes #12390)
author Bram Moolenaar <Bram@vim.org>
date Sat, 13 May 2023 13:00:04 +0200
parents 9667b7ed1ce4
children 8366257b3541
files .github/workflows/ci.yml src/version.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -180,8 +180,8 @@ jobs:
           DEST_DIR: ${{ env.TMPDIR }}/linux-modules-extra-${{ env.LINUX_VERSION }}
         run: |
           cd /lib/modules/${{ env.LINUX_VERSION }}
-          if [ sudo apt-get install -d -y linux-modules-extra-${{ env.LINUX_VERSION }} 2>&1 | $(grep "Unable to locate package ") ]; then
-          echo "Download of " linux-modules-extra-${{ env.LINUX_VERSION }} "failed continue anyway" exit 0
+          if apt-cache show linux-modules-extra-${{ env.LINUX_VERSION }} >/dev/null 2>&1 ; then
+          echo "Module " linux-modules-extra-${{ env.LINUX_VERSION }} "doesn't seem to exist, continue anyway"; exit 0
           else
           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}"
--- 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 */
 /**/
+    1548,
+/**/
     1547,
 /**/
     1546,