diff options
author | ichizok <gclient.gaap@gmail.com> | 2023-04-21 17:46:57 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2023-04-21 17:46:57 +0100 |
commit | 017227079f104bd69483ee3d33e31490d7e52135 (patch) | |
tree | d8fb70dc6e2f657d01c45554d2db40f7bc87f908 /.github | |
parent | 8281a16efc76197f7b0b2a385dffb44fce66d33e (diff) |
patch 9.0.1473: CI does not run sound testsv9.0.1473
Problem: CI does not run sound tests.
Solution: Re-enable sound tests. Use "apt-get" instead of "apt". (Ozaki
Kiichi, closes #12280)
Diffstat (limited to '.github')
-rw-r--r-- | .github/workflows/ci.yml | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a4b02404d9..d91e9cc855 100644 --- 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') |