Fix Linux x86 installation to be more robust

Author: jonsimantov

.github/workflows/integration_tests.yml

@@ -320,6 +320,7 @@ jobs:
           timeout_minutes: 15
           max_attempts: 3
           command: |
+            set -ex
             python scripts/gha/install_prereqs_desktop.py --gha_build --arch '${{ matrix.arch }}' --ssl '${{ matrix.ssl_variant }}'
             pip install -r scripts/gha/requirements.txt
             python scripts/gha/restore_secrets.py --passphrase "${{ secrets.TEST_SECRET }}"
@@ -875,8 +876,8 @@ jobs:
         with:
           timeout_minutes: 15
           max_attempts: 3
+          set -ex
           command: python scripts/gha/install_prereqs_desktop.py --gha_build --running_only --arch '${{ matrix.arch }}' --ssl '${{ matrix.ssl_variant }}'
-
       - name: Set up Node (12)
         uses: actions/setup-node@v2
         with:

scripts/gha/utils.py

@@ -249,7 +249,10 @@ def install_x86_support_libraries(gha_build=False):
       # Install them.
       run_command(['dpkg', '--add-architecture', 'i386'], as_root=True, check=True)
       run_command(['apt', 'update'], as_root=True, check=True)
-      run_command(['apt', 'install', '-V', '-y'] + packages, as_root=True, check=True)
+      process = run_command(['apt', 'install', '-V', '-y', '-f'] + packages, as_root=True)
+      if process.returncode != 0:
+       # Some dependency couldn't be installed, allow apt to fix things.
+       run_command(['apt', 'upgrade', '--with-new-pkgs'], as_root=True, check=True)
 
     if gha_build:
       # One more workaround: downgrading libpcre2-8-0 above may have uninstalled
@@ -260,3 +263,5 @@ def install_x86_support_libraries(gha_build=False):
       # Note: "-f" = "fix" - let apt do what it needs to do to fix dependencies.
       run_command(['apt', 'install', '-f', '-V', '-y', 'libsecret-1-dev'],
                   as_root=True, check=True)
+      # Allow apt to fix anything else that's broken.
+      run_command(['apt', 'upgrade', '--with-new-pkgs'], as_root=True, check=True)