ci: enable x86 tests

managarm · Nov 21, 2023 · 387463b · 387463b
1 parent 780841c
commit 387463b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ jobs:
     build-mlibc:
         strategy:
             matrix:
-                arch: [x86_64, riscv64, aarch64]
+                arch: [x86_64, riscv64, aarch64, x86]
                 builds: [mlibc, mlibc-static, mlibc-shared, mlibc-ansi-only, mlibc-headers-only]
         name: Build mlibc
         runs-on: ubuntu-20.04
@@ -16,7 +16,7 @@ jobs:
             #       xbstrap should fix this by demanding a recent version.
             run: |
                 sudo apt-get update
-                sudo apt-get install ninja-build g++-10 g++-10-riscv64-linux-gnu g++-10-aarch64-linux-gnu qemu-user
+                sudo apt-get install ninja-build g++-10 g++-10-riscv64-linux-gnu g++-10-aarch64-linux-gnu g++-10-i686-linux-gnu qemu-user
                 sudo pip3 install setuptools
                 sudo pip3 install -U jsonschema
                 sudo pip3 install meson xbstrap

diff --git a/ci/linux-x86.cross-file b/ci/linux-x86.cross-file
@@ -0,0 +1,10 @@
+[binaries]
+c = 'i686-linux-gnu-gcc-10'
+cpp = 'i686-linux-gnu-g++-10'
+exe_wrapper = 'qemu-i386'
+
+[host_machine]
+system = 'linux'
+cpu_family = 'x86'
+cpu = 'i386'
+endian = 'little'