Skip to content

Commit 0172270

Browse files
ichizokbrammool
authored andcommitted
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)
1 parent 8281a16 commit 0172270

3 files changed

Lines changed: 16 additions & 40 deletions

File tree

.github/workflows/ci.yml

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,12 @@ jobs:
9191
libsodium-dev \
9292
)
9393
fi
94-
sudo apt update && sudo apt install -y "${PKGS[@]}"
94+
sudo apt-get update && sudo apt-get install -y "${PKGS[@]}"
9595
9696
- name: Install gcc-11
9797
if: matrix.compiler == 'gcc'
9898
run: |
99-
sudo apt install -y gcc-11
99+
sudo apt-get install -y gcc-11
100100
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100
101101
sudo update-alternatives --set gcc /usr/bin/gcc-11
102102
@@ -106,7 +106,7 @@ jobs:
106106
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
107107
. /etc/lsb-release
108108
sudo add-apt-repository -y "deb http://apt.llvm.org/${DISTRIB_CODENAME}/ llvm-toolchain-${DISTRIB_CODENAME}-16 main"
109-
sudo apt install -y clang-16 llvm-16
109+
sudo apt-get install -y clang-16 llvm-16
110110
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-16 100
111111
sudo update-alternatives --set clang /usr/bin/clang-16
112112
sudo update-alternatives --install /usr/bin/llvm-cov llvm-cov /usr/bin/llvm-cov-16 100
@@ -120,7 +120,6 @@ jobs:
120120
(
121121
echo "LINUX_VERSION=$(uname -r)"
122122
echo "NPROC=$(getconf _NPROCESSORS_ONLN)"
123-
echo "SND_DUMMY_DIR=${HOME}/snd-dummy"
124123
echo "TMPDIR=${{ runner.temp }}"
125124
126125
case "${{ matrix.features }}" in
@@ -173,23 +172,17 @@ jobs:
173172
sudo usermod -a -G audio "${USER}"
174173
sudo bash ci/setup-xvfb.sh
175174
176-
# FIXME: Temporarily disabled because of build errors
177-
#- name: Cache snd-dummy
178-
# uses: actions/cache@v3
179-
# with:
180-
# path: ${{ env.SND_DUMMY_DIR }}
181-
# key: linux-${{ env.LINUX_VERSION }}-snd-dummy
182-
183-
#- name: Set up snd-dummy
184-
# run: |
185-
# if [[ ! -e ${SND_DUMMY_DIR}/snd-dummy.ko ]]; then
186-
# bash ci/build-snd-dummy.sh
187-
# fi
188-
# cd "${SND_DUMMY_DIR}"
189-
# sudo insmod soundcore.ko
190-
# sudo insmod snd.ko
191-
# sudo insmod snd-pcm.ko
192-
# sudo insmod snd-dummy.ko
175+
- name: Set up snd-dummy
176+
if: (!(contains(matrix.extra, 'unittests') || contains(matrix.extra, 'vimtags')))
177+
env:
178+
DEST_DIR: ${{ env.TMPDIR }}/linux-modules-extra-${{ env.LINUX_VERSION }}
179+
run: |
180+
cd /lib/modules/${{ env.LINUX_VERSION }}
181+
sudo apt-get install -d -y linux-modules-extra-${{ env.LINUX_VERSION }}
182+
sudo dpkg -x /var/cache/apt/archives/linux-modules-extra-${{ env.LINUX_VERSION }}*.deb "${DEST_DIR}"
183+
tar -cC "${DEST_DIR}"/lib/modules/${{ env.LINUX_VERSION }} kernel/sound | sudo tar -x
184+
sudo depmod
185+
sudo modprobe snd-dummy
193186
194187
- name: Check autoconf
195188
if: contains(matrix.extra, 'unittests')

ci/build-snd-dummy.sh

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -695,6 +695,8 @@ static char *(features[]) =
695695

696696
static int included_patches[] =
697697
{ /* Add new patch number below this line */
698+
/**/
699+
1473,
698700
/**/
699701
1472,
700702
/**/

0 commit comments

Comments
 (0)