diff options
| author | Christian Brabandt <cb@256bit.org> | 2023-05-13 11:54:47 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2023-05-13 11:54:47 +0100 |
| commit | ff40b625a693cf5094abe76b77655f13ad48739b (patch) | |
| tree | 7353735a179b193bbdf5d74ba0d83ae0e2aff9cb | |
| parent | 12eb0f4ec5a9d9899d09691f944e4fbfdf4318fd (diff) | |
| download | vim-git-ff40b625a693cf5094abe76b77655f13ad48739b.tar.gz | |
patch 9.0.1548: CI: check in sound-dummy module may throw an errorv9.0.1548
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)
| -rw-r--r-- | .github/workflows/ci.yml | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ca288aea8..40932b7f4 100644 --- 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 index 20a6e99d3..a3c9453d1 100644 --- 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, |