From 1273dfb015cf8f710023427658c147fa616bfe48 Mon Sep 17 00:00:00 2001 From: Philip H <47042125+pheiduck@users.noreply.github.com> Date: Thu, 24 Nov 2022 15:15:08 +0000 Subject: [PATCH] patch 9.0.0941: CI failures in sound dummy Problem: CI failures in sound dummy. Solution: Temporarily disable building sound dummy. (closes #11610) --- .github/workflows/ci.yml | 31 ++++++++++++++++--------------- src/version.c | 2 ++ 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4870127027..6e7690e9b4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -174,22 +174,23 @@ jobs: sudo usermod -a -G audio "${USER}" sudo bash ci/setup-xvfb.sh - - name: Cache snd-dummy - uses: actions/cache@v3 - with: - path: ${{ env.SND_DUMMY_DIR }} - key: linux-${{ env.LINUX_VERSION }}-snd-dummy + # 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 + # 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') diff --git a/src/version.c b/src/version.c index da0b1e5a5b..1568691ec4 100644 --- a/src/version.c +++ b/src/version.c @@ -695,6 +695,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 941, /**/ 940, /**/