mirror of
https://github.com/vim/vim.git
synced 2025-09-23 03:43:49 -04:00
CI: add sway compositor to CI tests, to prepare for better Wayland testing
closes: #17162 Signed-off-by: Foxe Chen <chen.foxe@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
committed by
Christian Brabandt
parent
92f68e26ec
commit
16341e7090
6
.github/workflows/ci.yml
vendored
6
.github/workflows/ci.yml
vendored
@@ -29,6 +29,7 @@ jobs:
|
|||||||
LOG_DIR: ${{ github.workspace }}/logs
|
LOG_DIR: ${{ github.workspace }}/logs
|
||||||
TERM: xterm
|
TERM: xterm
|
||||||
DISPLAY: ':99'
|
DISPLAY: ':99'
|
||||||
|
WAYLAND_DISPLAY: 'wayland-1'
|
||||||
DEBIAN_FRONTEND: noninteractive
|
DEBIAN_FRONTEND: noninteractive
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
@@ -114,6 +115,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
# This is added by default, and it is often broken, but we don't need anything from it
|
# This is added by default, and it is often broken, but we don't need anything from it
|
||||||
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
|
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
|
||||||
|
|
||||||
PKGS=( \
|
PKGS=( \
|
||||||
gettext \
|
gettext \
|
||||||
libgtk2.0-dev:${{ matrix.architecture }} \
|
libgtk2.0-dev:${{ matrix.architecture }} \
|
||||||
@@ -123,6 +125,7 @@ jobs:
|
|||||||
libxt-dev:${{ matrix.architecture }} \
|
libxt-dev:${{ matrix.architecture }} \
|
||||||
locales-all \
|
locales-all \
|
||||||
software-properties-common \
|
software-properties-common \
|
||||||
|
sway \
|
||||||
)
|
)
|
||||||
if ${{ matrix.features == 'huge' }}; then
|
if ${{ matrix.features == 'huge' }}; then
|
||||||
LUA_VER=${{ matrix.lua_ver || '5.4' }}
|
LUA_VER=${{ matrix.lua_ver || '5.4' }}
|
||||||
@@ -143,6 +146,7 @@ jobs:
|
|||||||
libattr1-dev
|
libattr1-dev
|
||||||
)
|
)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
sudo apt-get update && sudo apt-get upgrade -y && 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 }}
|
- name: Install gcc-${{ env.GCC_VER }}
|
||||||
@@ -232,6 +236,8 @@ jobs:
|
|||||||
sudo sysctl -w net.ipv6.conf.lo.disable_ipv6=0
|
sudo sysctl -w net.ipv6.conf.lo.disable_ipv6=0
|
||||||
sudo usermod -a -G audio "${USER}"
|
sudo usermod -a -G audio "${USER}"
|
||||||
sudo bash ci/setup-xvfb.sh
|
sudo bash ci/setup-xvfb.sh
|
||||||
|
# Sway requires user session
|
||||||
|
bash ci/setup-sway.sh
|
||||||
|
|
||||||
- name: Check autoconf
|
- name: Check autoconf
|
||||||
if: contains(matrix.extra, 'unittests')
|
if: contains(matrix.extra, 'unittests')
|
||||||
|
1
Filelist
1
Filelist
@@ -25,6 +25,7 @@ SRC_ALL = \
|
|||||||
ci/if_ver*.vim \
|
ci/if_ver*.vim \
|
||||||
ci/if_feat_check.vim \
|
ci/if_feat_check.vim \
|
||||||
ci/setup-xvfb.sh \
|
ci/setup-xvfb.sh \
|
||||||
|
ci/setup-sway.sh \
|
||||||
ci/remove_snap.sh \
|
ci/remove_snap.sh \
|
||||||
src/Make_all.mak \
|
src/Make_all.mak \
|
||||||
src/README.md \
|
src/README.md \
|
||||||
|
7
ci/setup-sway.sh
Normal file
7
ci/setup-sway.sh
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
|
||||||
|
# Using a systemd user service doesn't work because it seems like github actions
|
||||||
|
# doesn't support user sessions? Just run sway in the background and disown it.
|
||||||
|
WLR_BACKENDS=headless sway &
|
||||||
|
disown
|
Reference in New Issue
Block a user