Patch 9.0.1473

14 views
Skip to first unread message

Bram Moolenaar

unread,
Apr 21, 2023, 12:47:40 PM4/21/23
to vim...@googlegroups.com

Patch 9.0.1473
Problem: CI does not run sound tests.
Solution: Re-enable sound tests. Use "apt-get" instead of "apt". (Ozaki
Kiichi, closes #12280)
Files: .github/workflows/ci.yml, ci/build-snd-dummy.sh


*** ../vim-9.0.1472/.github/workflows/ci.yml 2023-03-05 20:56:32.812085652 +0000
--- .github/workflows/ci.yml 2023-04-21 17:44:02.672453875 +0100
***************
*** 91,102 ****
libsodium-dev \
)
fi
! sudo apt update && sudo apt install -y "${PKGS[@]}"

- name: Install gcc-11
if: matrix.compiler == 'gcc'
run: |
! sudo apt 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

--- 91,102 ----
libsodium-dev \
)
fi
! sudo apt-get update && sudo apt-get install -y "${PKGS[@]}"

- name: Install gcc-11
if: matrix.compiler == 'gcc'
run: |
! 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,112 ****
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 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
--- 106,112 ----
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-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,126 ****
(
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
--- 120,125 ----
***************
*** 173,195 ****
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: Check autoconf
if: contains(matrix.extra, 'unittests')
--- 172,188 ----
sudo usermod -a -G audio "${USER}"
sudo bash ci/setup-xvfb.sh

! - 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')
*** ../vim-9.0.1472/ci/build-snd-dummy.sh 2020-12-17 19:23:48.000000000 +0000
--- ci/build-snd-dummy.sh 1970-01-01 00:00:00.000000000 +0000
***************
*** 1,19 ****
- #!/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}"
--- 0 ----
*** ../vim-9.0.1472/src/version.c 2023-04-20 18:07:53.193187599 +0100
--- src/version.c 2023-04-21 17:45:21.980483831 +0100
***************
*** 697,698 ****
--- 697,700 ----
{ /* Add new patch number below this line */
+ /**/
+ 1473,
/**/

--
No children may attend school with their breath smelling of "wild onions."
[real standing law in West Virginia, United States of America]

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

Bram Moolenaar

unread,
May 9, 2023, 1:27:44 PM5/9/23
to vim...@googlegroups.com

> Patch 9.0.1473
> Problem: CI does not run sound tests.
> Solution: Re-enable sound tests. Use "apt-get" instead of "apt". (Ozaki
> Kiichi, closes #12280)
> Files: .github/workflows/ci.yml, ci/build-snd-dummy.sh

Unfortunately the snd-dummy setup started failing now:

Run cd /lib/modules/5.15.0-1036-azure
Reading package lists...
Building dependency tree...
Reading state information...
E: Unable to locate package linux-modules-extra-5.15.0-1036-azure
E: Couldn't find any package by glob 'linux-modules-extra-5.15.0-1036-azure'
E: Couldn't find any package by regex 'linux-modules-extra-5.15.0-1036-azure'
Error: Process completed with exit code 100.

Is there a fix? Or should I disable this for now?

--
Don't Panic!
-- The Hitchhiker's Guide to the Galaxy

Christian Brabandt

unread,
May 10, 2023, 3:10:01 AM5/10/23
to vim...@googlegroups.com

On Di, 09 Mai 2023, Bram Moolenaar wrote:

>
> > Patch 9.0.1473
> > Problem: CI does not run sound tests.
> > Solution: Re-enable sound tests. Use "apt-get" instead of "apt". (Ozaki
> > Kiichi, closes #12280)
> > Files: .github/workflows/ci.yml, ci/build-snd-dummy.sh
>
> Unfortunately the snd-dummy setup started failing now:
>
> Run cd /lib/modules/5.15.0-1036-azure
> Reading package lists...
> Building dependency tree...
> Reading state information...
> E: Unable to locate package linux-modules-extra-5.15.0-1036-azure
> E: Couldn't find any package by glob 'linux-modules-extra-5.15.0-1036-azure'
> E: Couldn't find any package by regex 'linux-modules-extra-5.15.0-1036-azure'
> Error: Process completed with exit code 100.
>
> Is there a fix? Or should I disable this for now?

It looks like there exists no package
linux-modules-extra-5.15.0-1036-azure but Ubuntu has in its repository
the package linux-modules-extra-5.15.0-1037-azure so I guess we have to
wait, until the runner is updated to run linux version 5.15.0-1037
(which should be there soon:
https://github.com/actions/runner-images/releases/tag/ubuntu22%2F20230507.1)

I guess it should resolve itself soon.


Best,
Christian
--
Die Rechtschreibung bereitet dem Menschen sein ganzes Leben lang
Schwierigkeiten, sei denn, er ist Analphabet.

Bram Moolenaar

unread,
May 10, 2023, 10:34:59 AM5/10/23
to vim...@googlegroups.com, Christian Brabandt

Christian wrote:

> On Di, 09 Mai 2023, Bram Moolenaar wrote:
>
> >
> > > Patch 9.0.1473
> > > Problem: CI does not run sound tests.
> > > Solution: Re-enable sound tests. Use "apt-get" instead of "apt". (Ozaki
> > > Kiichi, closes #12280)
> > > Files: .github/workflows/ci.yml, ci/build-snd-dummy.sh
> >
> > Unfortunately the snd-dummy setup started failing now:
> >
> > Run cd /lib/modules/5.15.0-1036-azure
> > Reading package lists...
> > Building dependency tree...
> > Reading state information...
> > E: Unable to locate package linux-modules-extra-5.15.0-1036-azure
> > E: Couldn't find any package by glob 'linux-modules-extra-5.15.0-1036-azure'
> > E: Couldn't find any package by regex 'linux-modules-extra-5.15.0-1036-azure'
> > Error: Process completed with exit code 100.
> >
> > Is there a fix? Or should I disable this for now?
>
> It looks like there exists no package
> linux-modules-extra-5.15.0-1036-azure but Ubuntu has in its repository
> the package linux-modules-extra-5.15.0-1037-azure so I guess we have to
> wait, until the runner is updated to run linux version 5.15.0-1037
> (which should be there soon:
> https://github.com/actions/runner-images/releases/tag/ubuntu22%2F20230507.1)
>
> I guess it should resolve itself soon.

Perhaps you can create a PR that reverts 9.0.1536, so we can see when
this works again.

It's strange that the version number goes out of sync, causing CI to
break. Perhaps we should use a different variable to get the version?

--
How To Keep A Healthy Level Of Insanity:
3. Every time someone asks you to do something, ask if they want fries
with that.

Christian Brabandt

unread,
May 10, 2023, 11:09:20 AM5/10/23
to vim...@googlegroups.com

On Mi, 10 Mai 2023, Bram Moolenaar wrote:

> Perhaps you can create a PR that reverts 9.0.1536, so we can see when
> this works again.

I should have thought of that already :facepalm Sure will do soon.

> It's strange that the version number goes out of sync, causing CI to
> break.

I am expecting a new kernel to be released quite soon, which fixes
CVE-2023-0386 (https://seclists.org/oss-sec/2023/q2/133) and as such
there will probably be a new runner required by Github anyhow. Or maybe
this was done already and was a reason for this problem?

> Perhaps we should use a different variable to get the version?

The way it was used looked good to me. Unfortunately there doesn't seem
to pin a github-runner to a specific release/kernel version and as such
this may happen occasionally I guess.


Best,
Christian
--
Es ereignet sich nichts Neues. Es sind immer dieselben alten
Geschichten, die von immer neuen Menschen erlebt werden.
-- William Faulkner
Reply all
Reply to author
Forward
0 new messages