ci: Avoid Ubuntu apt-get update that's killing the 24.04 runners (#4278)

Signed-off-by: Larry Gritz <[email protected]>
AcademySoftwareFoundation · Jun 1, 2024 · 1f8e563 · 1f8e563
1 parent f434dd3
commit 1f8e563
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -332,7 +332,12 @@ jobs:
                             EXTRA_DEP_PACKAGES="python3.12-dev python3-numpy"
                             PIP_INSTALLS="none"
                             USE_OPENVDB=0
+                            SKIP_APT_GET_UPDATE=1
                             # The installed OpenVDB has a TLS conflict with Python 3.8
+                            # Disabling the `apt-get update` in gh-installdeps.bash 
+                            # addresses a job killing problem in the GHA Ubuntu
+                            # 24.04 runners that cropped up circa May 29 2024. Maybe
+                            # it will be fixed and we can do the update again later?
           - desc: clang14 C++20 avx2 exr3.1 ocio2.1
             nametag: linux-clang14
             runner: ubuntu-20.04

diff --git a/src/build-scripts/gh-installdeps.bash b/src/build-scripts/gh-installdeps.bash
@@ -69,7 +69,9 @@ if [[ "$ASWF_ORG" != ""  ]] ; then
 else
     # Using native Ubuntu runner
 
-    time sudo apt-get update
+    if [[ "${SKIP_APT_GET_UPDATE}" != "1" ]] ; then
+        time sudo apt-get update
+    fi
 
     time sudo apt-get -q install -y \
         git cmake ninja-build ccache g++ \
@@ -82,7 +84,6 @@ else
             libavcodec-dev libavformat-dev libswscale-dev libavutil-dev \
             dcmtk libopenvdb-dev \
             libfreetype6-dev \
-            locales wget \
             libopencolorio-dev \
             libtbb-dev \
             libopencv-dev
@@ -138,10 +139,10 @@ else
     fi
 
     if [[ "$CXX" == "icpc" || "$CC" == "icc" || "$USE_ICC" != "" || "$USE_ICX" != "" ]] ; then
+        time sudo apt-get -q install -y wget
         wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
         sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
         echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
-        time sudo apt-get update
         time sudo apt-get install -y intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic
         set +e; source /opt/intel/oneapi/setvars.sh; set -e
     fi