From cf45bce73c7850bc4674b0e13422174f8f839eee Mon Sep 17 00:00:00 2001 From: Urs Fleisch Date: Sun, 27 Sep 2026 11:46:14 +0200 Subject: [PATCH] GitHub Actions: Build with Ubuntu 32-bit --- .github/workflows/build.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 37eba09d..626da8b8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,14 +9,16 @@ jobs: build: strategy: matrix: - os: [ubuntu-latest, macos-latest, windows-latest, windows-2025] + os: [ubuntu-latest, macos-latest, windows-latest, windows-2025, ubuntu-26.04] include: - os: windows-latest cmake_extra_args: '-DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake"' - os: windows-2025 cmake_extra_args: '-G "MinGW Makefiles" -DCPPUNIT_INCLUDE_DIR="$env:GITHUB_WORKSPACE/pkg/usr/local/include" -DCPPUNIT_LIBRARIES="$($env:GITHUB_WORKSPACE -replace "\\", "/")/pkg/usr/local/lib/libcppunit.dll.a" -DCPPUNIT_INSTALLED_VERSION="1.15.1"' - # The windows-2025 runner is used for MinGW. - name: ${{ matrix.os == 'windows-2025' && 'mingw' || matrix.os }} + - os: ubuntu-26.04 + cmake_extra_args: '-DCMAKE_C_FLAGS="-m32" -DCMAKE_CXX_FLAGS="-m32"' + # The windows-2025 runner is used for MinGW. The ubuntu-26.04 runner is used for 32-bit. + name: ${{ matrix.os == 'windows-2025' && 'mingw' || matrix.os == 'ubuntu-26.04' && 'i386' || matrix.os }} runs-on: ${{ matrix.os }} steps: - name: Checkout @@ -54,6 +56,13 @@ jobs: (cd build_cppunit && mingw32-make -j$(nproc) install DESTDIR=$(cd .. && pwd)/pkg) if: matrix.os == 'windows-2025' + - name: Set up Ubuntu i386 + run: | + sudo dpkg --add-architecture i386 + sudo apt update + sudo apt install -y gcc-multilib g++-multilib libc6-dev:i386 libcppunit-dev:i386 libutfcpp-dev zlib1g-dev:i386 + if: matrix.os == 'ubuntu-26.04' + - name: Configure run: > cmake -B${{github.workspace}}/build