Try slimmer container

Signed-off-by: Larry Gritz <lg@larrygritz.com>
lgritz · Sep 9, 2024 · 981435e · 981435e
1 parent fbf3836
commit 981435e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -38,15 +38,17 @@ jobs:
           - desc: docs
             nametag: docslinux
             runner: ubuntu-latest
-            container: aswftesting/ci-openexr:2024
+            # container: aswftesting/ci-oiio:2024
+            container: rockylinux:9
             vfxyear: 2024
             cxx_std: 17
-            python_ver: "3.11"
+            python_ver: "3.9"
             build_docs: 1
             skip_build: 1
             skip_tests: 1
             setenvs: export EXTRA_DEP_PACKAGES="doxygen sphinx-doc"
                             PIP_INSTALLS="sphinx breathe sphinx-tabs furo"
+                            ASWF_ORG=1
 
     runs-on: ${{ matrix.runner }}
     container:

diff --git a/src/build-scripts/gh-installdeps.bash b/src/build-scripts/gh-installdeps.bash
@@ -110,11 +110,6 @@ else
         time sudo apt-get -q install -y ${EXTRA_DEP_PACKAGES}
     fi
 
-    # Nonstandard python versions
-    # if [[ "${PYTHON_VERSION}" == "3.9" ]] ; then
-    #     time sudo apt-get -q install -y python3.9-dev python3-numpy
-    #     pip3 --version
-    # fi
     time sudo apt-get -q install -y python3-numpy
     if [[ "${PIP_INSTALLS}" != "" ]] ; then
         time pip3 install ${PIP_INSTALLS}