# HG changeset patch # User Bram Moolenaar # Date 1683975604 -7200 # Node ID 151dbe17df6c24ee0cb5485d25e60d6f117e9663 # Parent 9667b7ed1ce47ff21145177b1d48b991b45edeb1 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 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) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml --- 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}" diff --git a/src/version.c b/src/version.c --- 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,