Skip to content

Commit 897a158

Browse files
committed
Limit rpmfusion time
Signed-off-by: Larry Gritz <[email protected]>
1 parent c8f2f14 commit 897a158

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,12 +270,12 @@ jobs:
270270
pybind11_ver: v2.10.0
271271
simd: "avx2,f16c"
272272
benchmark: 1
273-
setenvs: export USE_OPENVDB=0 USE_OPENCV=0 USE_FFMPEG=0
273+
setenvs: export USE_OPENVDB=0 USE_OPENCV=0 USE_FFMPEG=0 USE_LIBUHDR=0
274274
UHDR_CMAKE_C_COMPILER=gcc
275275
UHDR_CMAKE_CXX_COMPILER=g++
276276
# Building libuhdr with icx results in test failures
277277
# so we force using gcc/g++.
278-
optional_deps_append: "LibRaw;Ptex;Qt6"
278+
optional_deps_append: "LibRaw;Ptex;Qt6;libuhdr"
279279
- desc: VFX2024 gcc11/C++17 py3.11 exr3.2 ocio2.3
280280
nametag: linux-vfx2024
281281
runner: ubuntu-latest

src/build-scripts/gh-installdeps.bash

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ if [[ "$ASWF_ORG" != "" ]] ; then
4242
sudo lsof | grep deleted
4343

4444
# time sudo dnf upgrade --refresh || true
45-
time sudo dnf install --nogpgcheck https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-$(rpm -E %rhel).noarch.rpm -y || true
45+
if [[ "${DO_RPMFUSION_REPO:-0}" != "0" ]] ; then
46+
time sudo dnf install --nogpgcheck https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-$(rpm -E %rhel).noarch.rpm -y || true
47+
fi
4648

4749
if [[ "$ASWF_VFXPLATFORM_VERSION" == "2022" ]] ; then
4850
# CentOS 7 based containers need the now-nonexistent centos repo to be

0 commit comments

Comments
 (0)