Revert "Remove x86 Linux support."

This reverts commit 9ede958.

Author: jonsimantov

.github/workflows/cpp-packaging.yml

@@ -342,8 +342,6 @@ jobs:
           linux_abi: "c++11"
         - os: macos-13
           build_type: "Debug"
-        - os: ubuntu-22.04
-          architecture: "x86"
         - os: ubuntu-22.04
           msvc_runtime: "dynamic"
         - os: ubuntu-22.04

.github/workflows/desktop.yml

@@ -77,8 +77,6 @@ jobs:
           # architecture excluees
           - os: macos-13
             architecture: "x86"
-          - os: ubuntu-22.04
-            architecture: "x86"
           # Xcode excludes -- allow only one on osx and linux
           - os: ubuntu-22.04
             xcode_version: "11.7"

.github/workflows/integration_tests.yml

@@ -270,11 +270,9 @@ jobs:
           arch: arm64
         - os: ubuntu-22.04
           arch: arm64
-        # Do not attempt to use x86 on Mac or Linux.
+        # Do not attempt to use x86 on Mac.
         - os: macos-13
           arch: x86
-        - os: ubuntu-22.04
-          arch: x86
         # Until we support building openssl from source, we can't use the
         # system's openssl when cross-compiling, except on Linux. Builds all
         # happen on x64 machines, so arm64 and x86 are technically
@@ -754,11 +752,9 @@ jobs:
           arch: arm64
         - os: ubuntu-22.04
           arch: arm64
-        # Do not attempt to use x86 on Mac or Linux.
+        # Do not attempt to use x86 on Mac.
         - os: macos-13
           arch: x86
-        - os: ubuntu-22.04
-          arch: x86
         # Until we support building openssl from source, we can't use the
         # system's openssl when cross-compiling, except on Linux. Builds all
         # happen on x64 machines, so arm64 and x86 are technically

scripts/gha/print_matrix_configuration.py

@@ -75,7 +75,7 @@
     "matrix": {
       "os": ["ubuntu-22.04", "macos-13"],
       "build_type": ["Release", "Debug"],
-      "architecture": ["x64"],
+      "architecture": ["x64", "x86"],
       "msvc_runtime": ["static","dynamic"],
       "xcode_version": ["15.1"],
       "python_version": ["3.7"],
@@ -129,7 +129,7 @@
         "android_device": ["android_target", "android_latest", "emulator_ftl_target", "emulator_ftl_latest"],
         "ios_device": ["ios_min", "ios_target", "ios_latest", "simulator_min", "simulator_target", "simulator_latest"],
         "tvos_device": ["tvos_simulator"],
-        "architecture_windows_linux": ["x64"],
+        "architecture_windows_linux": ["x64", "x86"],
         "architecture_macos": ["x64"],
       }
     },

scripts/gha/utils.py

@@ -235,9 +235,10 @@ def install_x86_support_libraries(gha_build=False):
                downgrading Ubuntu packages).
   """
   if is_linux_os():
-    packages = ['gcc-multilib', 'g++-multilib', 'libglib2.0-dev:i386',
+    packages = ['gcc-10-multilib', 'g++-10-multilib', 'libglib2.0-dev:i386',
                 'libsecret-1-dev:i386', 'libpthread-stubs0-dev:i386',
-                'libssl-dev:i386', 'libsecret-1-0:i386']
+                'libssl-dev:i386', 'libsecret-1-0:i386', 'libgcc-s1:i386',
+                'gcc-10-base:i386']
     remove_packages = []
 
     # First check if these packages exist on the machine already
@@ -255,8 +256,8 @@ def install_x86_support_libraries(gha_build=False):
       if gha_build:
         # Remove libpcre to prevent package conflicts.
         # Only remove packages on GitHub runners.
-        remove_packages = ['libpcre2-dev:amd64', 'libpcre2-32-0:amd64',
-                           'libpcre2-8-0:amd64', 'libpcre2-16-0:amd64']
+       remove_packages = ['libpcre2-16-0:amd64', 'libpcre2-32-0:amd64', 'libpcre2-8-0:amd64',
+                          'libpcre2-posix3:amd64', 'libpcre2-dev:amd64', 'pcre2-utils:amd64']
       # Note: With aptitude, you can remove package 'xyz' by specifying 'xyz-'
       # in the package list.
       run_command(['aptitude', 'install', '-V', '-y'] + packages +