aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2023-12-19 06:30:13 -0500
committerGitHub <noreply@github.com>2023-12-19 06:30:13 -0500
commit0c22081f6275cd08cae51b916d20fe3f11076c96 (patch)
tree839f174bbd44162b85f49a8b0a237fd4587dc4f8
parent90a12d4a164315628c01043108b6aaa8f3afb102 (diff)
parent3d8cd0c5d3ac10f13921d3c6adca1f6cf29668d2 (diff)
downloadrneovim-0c22081f6275cd08cae51b916d20fe3f11076c96.tar.gz
rneovim-0c22081f6275cd08cae51b916d20fe3f11076c96.tar.bz2
rneovim-0c22081f6275cd08cae51b916d20fe3f11076c96.zip
Merge pull request #26647 from jamessan/big-endian-timeout
ci(s390x): double TEST_TIMEOUT since tests are running via qemu
-rw-r--r--.github/workflows/optional.yml20
1 files changed, 13 insertions, 7 deletions
diff --git a/.github/workflows/optional.yml b/.github/workflows/optional.yml
index ebaf23d29b..0cd82550f3 100644
--- a/.github/workflows/optional.yml
+++ b/.github/workflows/optional.yml
@@ -9,6 +9,8 @@ concurrency:
env:
INSTALL_PREFIX: ${{ github.workspace }}/nvim-install
+ # Double test timeout since it's running via qemu
+ TEST_TIMEOUT: 2400
# TEST_FILE: test/functional/shada
# TEST_FILTER: foo
@@ -25,17 +27,21 @@ jobs:
- run: docker run --rm --privileged multiarch/qemu-user-static:register --reset
- uses: docker://multiarch/ubuntu-core:s390x-focal
with:
+ # Docker runs the command as root, but we want the build/test to run
+ # as non-root so permissions based tests run correctly
args: >
bash -c
"
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 &&
- git clone --depth=1 https://github.com/neovim/neovim.git &&
+ useradd --create-home qemuci &&
+ chown -R qemuci. . &&
+ runuser -u qemuci -- git clone --depth=1 https://github.com/neovim/neovim.git &&
cd neovim &&
- git fetch origin ${{ github.ref }}:pr &&
- git switch pr &&
- cmake -S cmake.deps -B .deps -G Ninja -D USE_BUNDLED_LUAJIT=OFF -D USE_BUNDLED_LUA=ON &&
- cmake --build .deps &&
- cmake -B build -G Ninja -D PREFER_LUA=ON &&
- make ${{ matrix.test }}
+ runuser -u qemuci -- git fetch origin ${{ github.ref }}:pr &&
+ runuser -u qemuci -- git switch pr &&
+ runuser -u qemuci -- cmake -S cmake.deps -B .deps -G Ninja -D USE_BUNDLED_LUAJIT=OFF -D USE_BUNDLED_LUA=ON &&
+ runuser -u qemuci -- cmake --build .deps &&
+ runuser -u qemuci -- cmake -B build -G Ninja -D PREFER_LUA=ON &&
+ runuser -u qemuci -- make ${{ matrix.test }}
"