diff options
| author | Bram Moolenaar <Bram@vim.org> | 2023-05-09 22:13:58 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2023-05-09 22:13:58 +0100 |
| commit | 5fc7959dcbc43ddf2e9a2a06c547a5c10804e3d1 (patch) | |
| tree | 1369b7c9918b19f025cda78b2c1d94b8ab94e6aa | |
| parent | a4467c433a767cc2dc046ff134094c1b6305b678 (diff) | |
| download | vim-git-5fc7959dcbc43ddf2e9a2a06c547a5c10804e3d1.tar.gz | |
patch 9.0.1536: CI: sound dummy stopped workingv9.0.1536
Problem: CI: sound dummy stopped working.
Solution: Temporarily stop using sound dummy.
| -rw-r--r-- | .github/workflows/ci.yml | 23 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 14 insertions, 11 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 84cb27925..6d50f8c1b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -174,17 +174,18 @@ jobs: sudo usermod -a -G audio "${USER}" sudo bash ci/setup-xvfb.sh - - name: Set up snd-dummy - if: (!(contains(matrix.extra, 'unittests') || contains(matrix.extra, 'vimtags'))) - env: - DEST_DIR: ${{ env.TMPDIR }}/linux-modules-extra-${{ env.LINUX_VERSION }} - run: | - cd /lib/modules/${{ env.LINUX_VERSION }} - 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}" - tar -cC "${DEST_DIR}"/lib/modules/${{ env.LINUX_VERSION }} kernel/sound | sudo tar -x - sudo depmod - sudo modprobe snd-dummy + # FIXME: Temporarily disabled because of build errors + # - name: Set up snd-dummy + # if: (!(contains(matrix.extra, 'unittests') || contains(matrix.extra, 'vimtags'))) + # env: + # DEST_DIR: ${{ env.TMPDIR }}/linux-modules-extra-${{ env.LINUX_VERSION }} + # run: | + # cd /lib/modules/${{ env.LINUX_VERSION }} + # 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}" + # tar -cC "${DEST_DIR}"/lib/modules/${{ env.LINUX_VERSION }} kernel/sound | sudo tar -x + # sudo depmod + # sudo modprobe snd-dummy - name: Check autoconf if: contains(matrix.extra, 'unittests') diff --git a/src/version.c b/src/version.c index 8da355b33..c8daf71c8 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 */ /**/ + 1536, +/**/ 1535, /**/ 1534, |