0
0
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00

patch 9.0.1871: Github CI does not run i386 job

Problem:  Github CI does not run i386 job
Solution: Add a i386 architecture

Add CI testing for i386

message_test recently failed on i386, which exposed a gap in the CI
testing.  Convert the shadowdir job to one that runs on i386 so we get
32-bit test coverage.

Since the GHA runners are x86_64, we can enable the i386 architecture
in dpkg and install i386 packages for the i386 CI jobs.  However, this
can't currently be done with features=huge since that would require
installing python3-dev:i386, which breaks the CI environment.

closes: #12975

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: James McCoy <jamessan@jamessan.com>
This commit is contained in:
James McCoy
2023-09-05 07:41:23 +02:00
committed by Christian Brabandt
parent 00df69e62b
commit a4245a10ea
2 changed files with 15 additions and 2 deletions

View File

@@ -37,6 +37,10 @@ jobs:
features: [tiny, normal, huge] features: [tiny, normal, huge]
compiler: [clang, gcc] compiler: [clang, gcc]
extra: [[]] extra: [[]]
# Only use non-native architecture when features != huge.
# features=huge tries to install python3-dev, which fails to install
# for the non-native architecture.
architecture: [native]
include: include:
- features: tiny - features: tiny
compiler: clang compiler: clang
@@ -46,6 +50,8 @@ jobs:
extra: [nogui] extra: [nogui]
- features: normal - features: normal
shadow: ./src/shadow shadow: ./src/shadow
compiler: gcc
architecture: i386
- features: huge - features: huge
coverage: true coverage: true
- features: huge - features: huge
@@ -75,13 +81,18 @@ jobs:
- name: Checkout repository from github - name: Checkout repository from github
uses: actions/checkout@v3 uses: actions/checkout@v3
- run: sudo dpkg --add-architecture i386
if: matrix.architecture == 'i386'
- name: Install packages - name: Install packages
run: | run: |
PKGS=( \ PKGS=( \
gettext \ gettext \
libgtk2.0-dev \ libgtk2.0-dev:${{ matrix.architecture }} \
desktop-file-utils \ desktop-file-utils \
libtool-bin \ libtool-bin \
libncurses-dev:${{ matrix.architecture }} \
libxt-dev:${{ matrix.architecture }} \
) )
if ${{ matrix.features == 'huge' }}; then if ${{ matrix.features == 'huge' }}; then
LUA_VER=${{ matrix.lua_ver || '5.4' }} LUA_VER=${{ matrix.lua_ver || '5.4' }}
@@ -106,7 +117,7 @@ jobs:
- name: Install gcc-${{ env.GCC_VER }} - name: Install gcc-${{ env.GCC_VER }}
if: matrix.compiler == 'gcc' if: matrix.compiler == 'gcc'
run: | run: |
sudo apt-get install -y gcc-${{ env.GCC_VER }} sudo apt-get install -y gcc-${{ env.GCC_VER }}:${{ matrix.architecture }}
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ env.GCC_VER }} 100 sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ env.GCC_VER }} 100
sudo update-alternatives --set gcc /usr/bin/gcc-${{ env.GCC_VER }} sudo update-alternatives --set gcc /usr/bin/gcc-${{ env.GCC_VER }}

View File

@@ -699,6 +699,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1871,
/**/ /**/
1870, 1870,
/**/ /**/