To: vim_dev@googlegroups.com
Subject: Patch 9.0.1473
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 9.0.1473
Problem:    CI does not run sound tests.
Solution:   Re-enable sound tests.  Use "apt-get" instead of "apt". (Ozaki
            Kiichi, closes #12280)
Files:      .github/workflows/ci.yml, ci/build-snd-dummy.sh


*** ../vim-9.0.1472/.github/workflows/ci.yml	2023-03-05 20:56:32.812085652 +0000
--- .github/workflows/ci.yml	2023-04-21 17:44:02.672453875 +0100
***************
*** 91,102 ****
                libsodium-dev \
              )
            fi
!           sudo apt update && sudo apt install -y "${PKGS[@]}"
  
        - name: Install gcc-11
          if:  matrix.compiler == 'gcc'
          run: |
!           sudo apt install -y gcc-11
            sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100
            sudo update-alternatives --set gcc /usr/bin/gcc-11
  
--- 91,102 ----
                libsodium-dev \
              )
            fi
!           sudo apt-get update && sudo apt-get install -y "${PKGS[@]}"
  
        - name: Install gcc-11
          if:  matrix.compiler == 'gcc'
          run: |
!           sudo apt-get install -y gcc-11
            sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100
            sudo update-alternatives --set gcc /usr/bin/gcc-11
  
***************
*** 106,112 ****
            wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
            . /etc/lsb-release
            sudo add-apt-repository -y "deb http://apt.llvm.org/${DISTRIB_CODENAME}/ llvm-toolchain-${DISTRIB_CODENAME}-16 main"
!           sudo apt install -y clang-16 llvm-16
            sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-16 100
            sudo update-alternatives --set clang /usr/bin/clang-16
            sudo update-alternatives --install /usr/bin/llvm-cov llvm-cov /usr/bin/llvm-cov-16 100
--- 106,112 ----
            wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
            . /etc/lsb-release
            sudo add-apt-repository -y "deb http://apt.llvm.org/${DISTRIB_CODENAME}/ llvm-toolchain-${DISTRIB_CODENAME}-16 main"
!           sudo apt-get install -y clang-16 llvm-16
            sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-16 100
            sudo update-alternatives --set clang /usr/bin/clang-16
            sudo update-alternatives --install /usr/bin/llvm-cov llvm-cov /usr/bin/llvm-cov-16 100
***************
*** 120,126 ****
            (
            echo "LINUX_VERSION=$(uname -r)"
            echo "NPROC=$(getconf _NPROCESSORS_ONLN)"
-           echo "SND_DUMMY_DIR=${HOME}/snd-dummy"
            echo "TMPDIR=${{ runner.temp }}"
  
            case "${{ matrix.features }}" in
--- 120,125 ----
***************
*** 173,195 ****
            sudo usermod -a -G audio "${USER}"
            sudo bash ci/setup-xvfb.sh
  
!       # FIXME: Temporarily disabled because of build errors
!       #- name: Cache snd-dummy
!       #  uses: actions/cache@v3
!       #  with:
!       #    path: ${{ env.SND_DUMMY_DIR }}
!       #    key: linux-${{ env.LINUX_VERSION }}-snd-dummy
! 
!       #- name: Set up snd-dummy
!       #  run: |
!       #    if [[ ! -e ${SND_DUMMY_DIR}/snd-dummy.ko ]]; then
!       #      bash ci/build-snd-dummy.sh
!       #    fi
!       #    cd "${SND_DUMMY_DIR}"
!       #    sudo insmod soundcore.ko
!       #    sudo insmod snd.ko
!       #    sudo insmod snd-pcm.ko
!       #    sudo insmod snd-dummy.ko
  
        - name: Check autoconf
          if: contains(matrix.extra, 'unittests')
--- 172,188 ----
            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
  
        - name: Check autoconf
          if: contains(matrix.extra, 'unittests')
*** ../vim-9.0.1472/ci/build-snd-dummy.sh	2020-12-17 19:23:48.000000000 +0000
--- ci/build-snd-dummy.sh	1970-01-01 00:00:00.000000000 +0000
***************
*** 1,19 ****
- #!/bin/bash
- set -eu
- 
- LINUX_VERSION=$(uname -r | cut -d. -f1-2)
- LINUX_ARCHIVE_FILE=v${LINUX_VERSION}.tar.gz
- LINUX_SOURCE_DIR=linux-${LINUX_VERSION}
- 
- mkdir -p "${TMPDIR}"
- cd "${TMPDIR}"
- 
- wget -q "https://github.com/torvalds/linux/archive/${LINUX_ARCHIVE_FILE}"
- 
- tar -xf "${LINUX_ARCHIVE_FILE}" "${LINUX_SOURCE_DIR}/sound"
- cd "${LINUX_SOURCE_DIR}/sound"
- 
- CC=gcc make -C "/lib/modules/$(uname -r)/build" M="${PWD}" CONFIG_SOUND=m CONFIG_SND=m CONFIG_SND_PCM=m CONFIG_SND_DUMMY=m modules
- 
- mkdir -p "${SND_DUMMY_DIR}"
- cp soundcore.ko core/snd.ko core/snd-pcm.ko drivers/snd-dummy.ko "${SND_DUMMY_DIR}"
--- 0 ----
*** ../vim-9.0.1472/src/version.c	2023-04-20 18:07:53.193187599 +0100
--- src/version.c	2023-04-21 17:45:21.980483831 +0100
***************
*** 697,698 ****
--- 697,700 ----
  {   /* Add new patch number below this line */
+ /**/
+     1473,
  /**/

-- 
No children may attend school with their breath smelling of "wild onions."
		[real standing law in West Virginia, United States of America]

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///