Mercurial > vim
changeset 32284:8a7a4c1f41e0 v9.0.1473
patch 9.0.1473: CI does not run sound tests
Commit: https://github.com/vim/vim/commit/017227079f104bd69483ee3d33e31490d7e52135
Author: ichizok <gclient.gaap@gmail.com>
Date: Fri Apr 21 17:46:57 2023 +0100
patch 9.0.1473: CI does not run sound tests
Problem: CI does not run sound tests.
Solution: Re-enable sound tests. Use "apt-get" instead of "apt". (Ozaki
Kiichi, closes #12280)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 21 Apr 2023 19:00:04 +0200 |
| parents | 9d584852b1af |
| children | 3eaac488d36f |
| files | .github/workflows/ci.yml ci/build-snd-dummy.sh src/version.c |
| diffstat | 3 files changed, 16 insertions(+), 40 deletions(-) [+] |
line wrap: on
line diff
--- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -91,12 +91,12 @@ jobs: libsodium-dev \ ) fi - sudo apt update && sudo apt install -y "${PKGS[@]}" + sudo apt-get update && sudo apt-get install -y "${PKGS[@]}" - name: Install gcc-11 if: matrix.compiler == 'gcc' run: | - sudo apt install -y gcc-11 + 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,7 +106,7 @@ jobs: 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 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,7 +120,6 @@ jobs: ( 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 @@ -173,23 +172,17 @@ jobs: 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: 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')
deleted file mode 100644 --- a/ci/build-snd-dummy.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/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}"