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 <cb@256bit.org>
diff --git a/src/testdir/dumps/Test_verbose_system_1.vim b/src/testdir/dumps/Test_verbose_system_1.vim
index 65e9c8a..c0cbe1a 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 65e9c8a..c0cbe1a 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 2dce6c6..c566bbc 100644
--- a/src/testdir/test_messages.vim
+++ b/src/testdir/test_messages.vim
@@ -386,7 +386,7 @@
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 825cfb8..76de99d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1104,
+/**/
1103,
/**/
1102,