Skip to content

Commit f0ed0e6

Browse files
Drew Vogelchrisbra
authored andcommitted
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 <[email protected]>
1 parent 5881828 commit f0ed0e6

5 files changed

Lines changed: 13 additions & 10 deletions

File tree

.github/workflows/ci.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ permissions:
1717

1818
jobs:
1919
linux:
20-
runs-on: ${{ matrix.architecture == 'arm64' && 'ubuntu-22.04-arm' || 'ubuntu-22.04' }}
20+
runs-on: ${{ matrix.architecture == 'arm64' && 'ubuntu-24.04-arm' || 'ubuntu-24.04' }}
2121

2222
env:
2323
CC: ${{ matrix.compiler }}
@@ -115,6 +115,7 @@ jobs:
115115
libncurses-dev:${{ matrix.architecture }} \
116116
libxt-dev:${{ matrix.architecture }} \
117117
locales-all \
118+
software-properties-common \
118119
)
119120
if ${{ matrix.features == 'huge' }}; then
120121
LUA_VER=${{ matrix.lua_ver || '5.4' }}
@@ -124,7 +125,6 @@ jobs:
124125
lcov \
125126
libcanberra-dev \
126127
libperl-dev \
127-
python2-dev \
128128
python3-dev \
129129
liblua${LUA_VER}-dev \
130130
lua${LUA_VER} \
@@ -136,7 +136,7 @@ jobs:
136136
libattr1-dev
137137
)
138138
fi
139-
sudo apt-get update && sudo apt-get upgrade && sudo apt-get install -y "${PKGS[@]}"
139+
sudo apt-get update && sudo apt-get upgrade -y && sudo apt-get install -y "${PKGS[@]}"
140140
141141
- name: Install gcc-${{ env.GCC_VER }}
142142
if: matrix.compiler == 'gcc'
@@ -168,7 +168,7 @@ jobs:
168168
(
169169
echo "LINUX_VERSION=$(uname -r)"
170170
echo "NPROC=$(getconf _NPROCESSORS_ONLN)"
171-
echo "TMPDIR=${{ runner.temp }}"
171+
echo "TMPDIR=$(mktemp -d -p /tmp)"
172172
173173
case "${{ matrix.features }}" in
174174
tiny)
@@ -185,7 +185,8 @@ jobs:
185185
if ${{ matrix.python3 == 'stable-abi' }}; then
186186
PYTHON3_CONFOPT="--with-python3-stable-abi=3.8"
187187
fi
188-
echo "CONFOPT=--enable-perlinterp=${INTERFACE} --enable-pythoninterp=${INTERFACE} --enable-python3interp=${INTERFACE} --enable-rubyinterp=${INTERFACE} --enable-luainterp=${INTERFACE} --enable-tclinterp=${INTERFACE} ${PYTHON3_CONFOPT}"
188+
# The ubuntu-24.04 CI runner does not provide a python2 package.
189+
echo "CONFOPT=--enable-perlinterp=${INTERFACE} --enable-pythoninterp=no --enable-python3interp=${INTERFACE} --enable-rubyinterp=${INTERFACE} --enable-luainterp=${INTERFACE} --enable-tclinterp=${INTERFACE} ${PYTHON3_CONFOPT}"
189190
;;
190191
esac
191192
@@ -263,8 +264,8 @@ jobs:
263264
if: matrix.architecture != 'arm64'
264265
timeout-minutes: 25
265266
run: |
266-
do_test() { echo "$*"; sg audio "sg $(id -gn) '$*'"; }
267-
do_test make ${SHADOWOPT} ${TEST}
267+
make ${SHADOWOPT} ${TEST}
268+
268269
269270
# `sg audio` does not work on arm64 runner due to permission ('Incorrect password' error).
270271
- name: Test on arm64

src/testdir/dumps/Test_verbose_system_1.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
" that shows the system() command executed.
33
" This should be on the first line, but if it isn't there ignore the error,
44
" the screendump will then show the problem.
5-
1s+|t|m|p|/|.|.|.*| |+|t|m|p|/|x|x|x|x|x|x|x|/|1| |+e
5+
1,2s+|>|/|.*|2|>|&|1|".*+|>|.|.|.|2|>|\&|1|"+e

src/testdir/dumps/Test_verbose_system_2.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
" that shows the system() command executed.
33
" This should be on the first line, but if it isn't there ignore the error,
44
" the screendump will then show the problem.
5-
1s+|t|m|p|/|.|.|.*| |+|t|m|p|/|x|x|x|x|x|x|x|/|1| |+e
5+
1,2s+|>|/|.*|2|>|&|1|".*+|>|.|.|.|2|>|\&|1|"+e

src/testdir/test_messages.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ endfunc
386386
func Test_echo_verbose_system()
387387
CheckRunVimInTerminal
388388
CheckUnix " needs the "seq" command
389-
CheckNotMac " doesn't use /tmp
389+
CheckNotMac " the macos TMPDIR is too long for snapshot testing
390390

391391
let buf = RunVimInTerminal('', {'rows': 10})
392392
call term_sendkeys(buf, ":4 verbose echo system('seq 20')\<CR>")

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,8 @@ static char *(features[]) =
704704

705705
static int included_patches[] =
706706
{ /* Add new patch number below this line */
707+
/**/
708+
1104,
707709
/**/
708710
1103,
709711
/**/

0 commit comments

Comments
 (0)