From 520f6e5fdc736c389780accd398540c5b40a52bc Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Sat, 7 Jan 2023 20:27:00 -0500
Subject: [PATCH] CI: Try apt twice to reduce false network failures

---
 ci/ci-install.bash | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ci/ci-install.bash b/ci/ci-install.bash
index e74e0bc92..2424e595b 100755
--- a/ci/ci-install.bash
+++ b/ci/ci-install.bash
@@ -57,19 +57,24 @@ if [ "$CI_BUILD_STAGE_NAME" = "build" ]; then
   # build Verilator
 
   if [ "$CI_OS_NAME" = "linux" ]; then
+    sudo apt-get update ||
     sudo apt-get update
+    sudo apt-get install libfl-dev ccache ||
     sudo apt-get install libfl-dev ccache
     if [ "$CI_RUNS_ON" != "ubuntu-22.04" ]; then
       # Some conflict of libunwind verison on 22.04, can live without it for now
+      sudo apt-get install libgoogle-perftools-dev ||
       sudo apt-get install libgoogle-perftools-dev
     fi
     if [ "$CI_RUNS_ON" = "ubuntu-20.04" ] || [ "$CI_RUNS_ON" = "ubuntu-22.04" ]; then
+      sudo apt-get install libsystemc libsystemc-dev ||
       sudo apt-get install libsystemc libsystemc-dev
     fi
     if [ "$COVERAGE" = 1 ]; then
       yes yes | sudo cpan -fi Parallel::Forker
     fi
     if [ "$CI_M32" = 1 ]; then
+      sudo apt-get install gcc-multilib g++-multilib ||
       sudo apt-get install gcc-multilib g++-multilib
     fi
   elif [ "$CI_OS_NAME" = "osx" ]; then
@@ -90,18 +95,23 @@ elif [ "$CI_BUILD_STAGE_NAME" = "test" ]; then
   # run the tests
 
   if [ "$CI_OS_NAME" = "linux" ]; then
+    sudo apt-get update ||
     sudo apt-get update
     # libfl-dev needed for internal coverage's test runs
+    sudo apt-get install gdb gtkwave lcov libfl-dev ccache ||
     sudo apt-get install gdb gtkwave lcov libfl-dev ccache
     # Required for test_regress/t/t_dist_attributes.pl
     if [ "$CI_RUNS_ON" = "ubuntu-22.04" ]; then
+      sudo apt-get install libclang-dev ||
       sudo apt-get install libclang-dev
       pip3 install clang==14.0
     fi
     if [ "$CI_RUNS_ON" = "ubuntu-20.04" ] || [ "$CI_RUNS_ON" = "ubuntu-22.04" ]; then
+      sudo apt-get install libsystemc-dev ||
       sudo apt-get install libsystemc-dev
     fi
     if [ "$CI_M32" = 1 ]; then
+      sudo apt-get install lib32z1-dev gcc-multilib g++-multilib ||
       sudo apt-get install lib32z1-dev gcc-multilib g++-multilib
     fi
   elif [ "$CI_OS_NAME" = "osx" ]; then