From cfd2f50b619dd078959307497a9f79ee32570b35 Mon Sep 17 00:00:00 2001 From: Larry Gritz Date: Sat, 21 Oct 2023 15:11:54 -0700 Subject: [PATCH] wip Signed-off-by: Larry Gritz --- .github/workflows/ci.yml | 5 +++-- src/build-scripts/gh-installdeps.bash | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8e9b3c1dcb..524a514010 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -334,8 +334,9 @@ jobs: LLVM_DISTRO_NAME=ubuntu-18.04 OPENIMAGEIO_CMAKE_FLAGS="-DBUILD_FMT_VERSION=10.1.0" PUGIXML_VERSION=v1.13 - xINSTALL_DEP_PACKAGES=NO - xEXTRA_DEP_PACKAGES="git cmake" + INSTALL_DEP_PACKAGES=NO + EXTRA_DEP_PACKAGES="" + QT_VERSION=0 # - desc: Debug gcc7/C++14 llvm9 py2.7 oiio2.3 exr2.4 sse4 boost1.65 exr2.4 diff --git a/src/build-scripts/gh-installdeps.bash b/src/build-scripts/gh-installdeps.bash index e5424095ee..d534d207c2 100755 --- a/src/build-scripts/gh-installdeps.bash +++ b/src/build-scripts/gh-installdeps.bash @@ -64,8 +64,8 @@ else # sudo add-apt-repository ppa:ubuntu-toolchain-r/test time sudo apt-get update + time sudo apt-get -q -y --only-upgrade install grub-efi-amd64-signed || /bin/true - export DEBIAN_FRONTEND="noninteractive" echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections if [[ "$INSTALL_DEP_PACKAGES" != "NO" ]] ; then time sudo apt-get -q install -y \