diff options
-rw-r--r-- | .github/workflows/ci.yml | 35 | ||||
-rw-r--r-- | ci/build-snd-dummy.sh | 19 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 16 insertions, 40 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') diff --git a/ci/build-snd-dummy.sh b/ci/build-snd-dummy.sh deleted file mode 100644 index a2380b4b16..0000000000 --- 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}" diff --git a/src/version.c b/src/version.c index 611bd82ab2..c3e2afed47 100644 --- 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 */ /**/ + 1473, +/**/ 1472, /**/ 1471, |