kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-23 20:55:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(build): issues with s390x CI

Browse Source 
Does not fix everything, but at least let's test run to finish before
timeout
This commit is contained in:
bfredl 2024-01-08 14:34:49 +01:00
parent 0346666f71
commit 176bfea135
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/optional.yml vendored
View File

@ -11,7 +11,7 @@ concurrency:
env: env:
INSTALL_PREFIX: ${{ github.workspace }}/nvim-install INSTALL_PREFIX: ${{ github.workspace }}/nvim-install
# Double test timeout since it's running via qemu # Double test timeout since it's running via qemu
TEST_TIMEOUT: 2400 TEST_TIMEOUT: 3600
# TEST_FILE: test/functional/shada # TEST_FILE: test/functional/shada
# TEST_FILTER: foo # TEST_FILTER: foo
@ -23,7 +23,7 @@ jobs:
matrix: matrix:
test: [functionaltest, oldtest] test: [functionaltest, oldtest]
runs-on: ubuntu-latest runs-on: ubuntu-latest
timeout-minutes: 60 timeout-minutes: 90
steps: steps:
- run: docker run --rm --privileged multiarch/qemu-user-static:register --reset - run: docker run --rm --privileged multiarch/qemu-user-static:register --reset
- uses: docker://multiarch/ubuntu-core:s390x-focal - uses: docker://multiarch/ubuntu-core:s390x-focal
@ -34,7 +34,7 @@ jobs:
bash -c bash -c
" "
apt-get -y update && apt-get -y update &&
DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential cmake curl gettext ninja-build locales-all cpanminus git attr libattr1-dev && time DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential cmake curl gettext ninja-build locales-all cpanminus git attr libattr1-dev xdg-utils &&
useradd --create-home qemuci && useradd --create-home qemuci &&
chown -R qemuci. . && chown -R qemuci. . &&
runuser -u qemuci -- git clone --depth=1 https://github.com/neovim/neovim.git && runuser -u qemuci -- git clone --depth=1 https://github.com/neovim/neovim.git &&

7
src/nvim/lua/xdiff.c
View File

@ -185,7 +185,12 @@ static mmfile_t get_string_arg(lua_State *lstate, int idx)
luaL_argerror(lstate, idx, "expected string"); luaL_argerror(lstate, idx, "expected string");
} }
mmfile_t mf; mmfile_t mf;
mf.ptr = (char *)lua_tolstring(lstate, idx, (size_t *)&mf.size); size_t size;
mf.ptr = (char *)lua_tolstring(lstate, idx, &size);
if (size > INT_MAX) {
luaL_argerror(lstate, idx, "string too long");
}
mf.size = (int)size;
return mf; return mf;
} }