wip

Signed-off-by: Larry Gritz <[email protected]>
AcademySoftwareFoundation · Oct 21, 2023 · 3a36985 · 3a36985
1 parent 4c8695b
commit 3a36985
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -64,8 +64,8 @@ else
 
     # sudo add-apt-repository ppa:ubuntu-toolchain-r/test
     time sudo apt-get update
+    time sudo apt-get -q --only-upgrade install grub-efi-amd64-signed || /bin/tru
 
-    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 \