patch 9.1.1104: CI: using Ubuntu 22.04 Github runners
Commit:
https://github.com/vim/vim/commit/f0ed0e6f6304d2eb6f43866126912c139778257d
Author: Drew Vogel <dvogel@github>
Date: Tue Feb 11 21:36:33 2025 +0100
patch 9.1.1104: CI: using Ubuntu 22.04 Github runners
Problem: CI: uses Ubuntu 22.04 runners
Solution: Switch to Ubuntu 24.04 runners, make a few adjustments for
different $TMPDIR (Drew Vogel)
closes: #16442
Signed-off-by: Drew Vogel <dvogel@github>
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 78175bd98..a4eccf07f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ permissions:
jobs:
linux:
- runs-on: ${{ matrix.architecture == 'arm64' && 'ubuntu-22.04-arm' ||
'ubuntu-22.04' }}
+ runs-on: ${{ matrix.architecture == 'arm64' && 'ubuntu-24.04-arm' ||
'ubuntu-24.04' }}
env:
CC: ${{ matrix.compiler }}
@@ -115,6 +115,7 @@ jobs:
libncurses-dev:${{ matrix.architecture }} \
libxt-dev:${{ matrix.architecture }} \
locales-all \
+ software-properties-common \
)
if ${{ matrix.features == 'huge' }}; then
LUA_VER=${{ matrix.lua_ver || '5.4' }}
@@ -124,7 +125,6 @@ jobs:
lcov \
libcanberra-dev \
libperl-dev \
- python2-dev \
python3-dev \
liblua${LUA_VER}-dev \
lua${LUA_VER} \
@@ -136,7 +136,7 @@ jobs:
libattr1-dev
)
fi
- sudo apt-get update && sudo apt-get upgrade && sudo apt-get install
-y "${PKGS[@]}"
+ sudo apt-get update && sudo apt-get upgrade -y && sudo apt-get
install -y "${PKGS[@]}"
- name: Install gcc-${{ env.GCC_VER }}
if: matrix.compiler == 'gcc'
@@ -168,7 +168,7 @@ jobs:
(
echo "LINUX_VERSION=$(uname -r)"
echo "NPROC=$(getconf _NPROCESSORS_ONLN)"
- echo "TMPDIR=${{ runner.temp }}"
+ echo "TMPDIR=$(mktemp -d -p /tmp)"
case "${{ matrix.features }}" in
tiny)
@@ -185,7 +185,8 @@ jobs:
if ${{ matrix.python3 == 'stable-abi' }}; then
PYTHON3_CONFOPT="--with-python3-stable-abi=3.8"
fi
- echo "CONFOPT=--enable-perlinterp=${INTERFACE}
--enable-pythoninterp=${INTERFACE} --enable-python3interp=${INTERFACE}
--enable-rubyinterp=${INTERFACE} --enable-luainterp=${INTERFACE}
--enable-tclinterp=${INTERFACE} ${PYTHON3_CONFOPT}"
+ # The ubuntu-24.04 CI runner does not provide a python2 package.
+ echo "CONFOPT=--enable-perlinterp=${INTERFACE}
--enable-pythoninterp=no --enable-python3interp=${INTERFACE}
--enable-rubyinterp=${INTERFACE} --enable-luainterp=${INTERFACE}
--enable-tclinterp=${INTERFACE} ${PYTHON3_CONFOPT}"
;;
esac
@@ -263,8 +264,8 @@ jobs:
if: matrix.architecture != 'arm64'
timeout-minutes: 25
run: |
- do_test() { echo "$*"; sg audio "sg $(id -gn) '$*'"; }
- do_test make ${SHADOWOPT} ${TEST}
+ make ${SHADOWOPT} ${TEST}
+
# `sg audio` does not work on arm64 runner due to permission ('Incorrect
password' error).
- name: Test on arm64
diff --git a/src/testdir/dumps/Test_verbose_system_1.vim
b/src/testdir/dumps/Test_verbose_system_1.vim
index 65e9c8a37..c0cbe1a73 100644
--- a/src/testdir/dumps/Test_verbose_system_1.vim
+++ b/src/testdir/dumps/Test_verbose_system_1.vim
@@ -2,4 +2,4 @@
" that shows the system() command executed.
" This should be on the first line, but if it isn't there ignore the error,
" the screendump will then show the problem.
-1s+|t|m|p|/|.|.|.*| |+|t|m|p|/|x|x|x|x|x|x|x|/|1| |+e
+1,2s+|>|/|.*|2|>|&|1|".*+|>|.|.|.|2|>|\&|1|"+e
diff --git a/src/testdir/dumps/Test_verbose_system_2.vim
b/src/testdir/dumps/Test_verbose_system_2.vim
index 65e9c8a37..c0cbe1a73 100644
--- a/src/testdir/dumps/Test_verbose_system_2.vim
+++ b/src/testdir/dumps/Test_verbose_system_2.vim
@@ -2,4 +2,4 @@
" that shows the system() command executed.
" This should be on the first line, but if it isn't there ignore the error,
" the screendump will then show the problem.
-1s+|t|m|p|/|.|.|.*| |+|t|m|p|/|x|x|x|x|x|x|x|/|1| |+e
+1,2s+|>|/|.*|2|>|&|1|".*+|>|.|.|.|2|>|\&|1|"+e
diff --git a/src/testdir/test_messages.vim b/src/testdir/test_messages.vim
index 2dce6c64d..c566bbc4d 100644
--- a/src/testdir/test_messages.vim
+++ b/src/testdir/test_messages.vim
@@ -386,7 +386,7 @@ endfunc
func Test_echo_verbose_system()
CheckRunVimInTerminal
CheckUnix " needs the "seq" command
- CheckNotMac " doesn't use /tmp
+ CheckNotMac " the macos TMPDIR is too long for snapshot testing
let buf = RunVimInTerminal('', {'rows': 10})
call term_sendkeys(buf, ":4 verbose echo system('seq 20')\<CR>")
diff --git a/src/version.c b/src/version.c
index 825cfb80c..76de99dd0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1104,
/**/
1103,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1thx7w-003EgX-TK%40256bit.org.
