# HG changeset patch # User Bram Moolenaar # Date 1683666905 -7200 # Node ID b3ffcb4cc4a5da14c96218b7470a95629ecc83d4 # Parent 34c1d8c350b91b4c86faf9d947b548148c6b6f8f patch 9.0.1536: CI: sound dummy stopped working Commit: https://github.com/vim/vim/commit/5fc7959dcbc43ddf2e9a2a06c547a5c10804e3d1 Author: Bram Moolenaar Date: Tue May 9 22:13:58 2023 +0100 patch 9.0.1536: CI: sound dummy stopped working Problem: CI: sound dummy stopped working. Solution: Temporarily stop using sound dummy. diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml --- 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 --- 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,