File tree Expand file tree Collapse file tree 2 files changed +9
-3
lines changed
Expand file tree Collapse file tree 2 files changed +9
-3
lines changed Original file line number Diff line number Diff line change @@ -332,7 +332,12 @@ jobs:
332332 EXTRA_DEP_PACKAGES="python3.12-dev python3-numpy"
333333 PIP_INSTALLS="none"
334334 USE_OPENVDB=0
335+ SKIP_APT_GET_UPDATE=1
335336 # The installed OpenVDB has a TLS conflict with Python 3.8
337+ # Disabling the `apt-get update` in gh-installdeps.bash
338+ # addresses a job killing problem in the GHA Ubuntu
339+ # 24.04 runners that cropped up circa May 29 2024. Maybe
340+ # it will be fixed and we can do the update again later?
336341 - desc : clang14 C++20 avx2 exr3.1 ocio2.1
337342 nametag : linux-clang14
338343 runner : ubuntu-20.04
Original file line number Diff line number Diff line change @@ -69,7 +69,9 @@ if [[ "$ASWF_ORG" != "" ]] ; then
6969else
7070 # Using native Ubuntu runner
7171
72- time sudo apt-get update
72+ if [[ " ${SKIP_APT_GET_UPDATE} " != " 1" ]] ; then
73+ time sudo apt-get update
74+ fi
7375
7476 time sudo apt-get -q install -y \
7577 git cmake ninja-build ccache g++ \
8284 libavcodec-dev libavformat-dev libswscale-dev libavutil-dev \
8385 dcmtk libopenvdb-dev \
8486 libfreetype6-dev \
85- locales wget \
8687 libopencolorio-dev \
8788 libtbb-dev \
8889 libopencv-dev
@@ -138,10 +139,10 @@ else
138139 fi
139140
140141 if [[ " $CXX " == " icpc" || " $CC " == " icc" || " $USE_ICC " != " " || " $USE_ICX " != " " ]] ; then
142+ time sudo apt-get -q install -y wget
141143 wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
142144 sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
143145 echo " deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
144- time sudo apt-get update
145146 time sudo apt-get install -y intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic
146147 set +e; source /opt/intel/oneapi/setvars.sh; set -e
147148 fi
You can’t perform that action at this time.
0 commit comments