From a0e8a7324e5e656e963edcca6d3e49a1c043286c Mon Sep 17 00:00:00 2001
From: Cary Phillips <cary@ilm.com>
Date: Wed, 27 Mar 2024 10:30:15 -0700
Subject: [PATCH] test31

Signed-off-by: Cary Phillips <cary@ilm.com>
---
 .github/workflows/website_workflow.yml | 23 +----------------------
 .readthedocs.yml                       |  7 -------
 website/scripts/install_doxygen.sh     |  4 +---
 3 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/website_workflow.yml b/.github/workflows/website_workflow.yml
index 2000c9669e..af340dcdf9 100644
--- a/.github/workflows/website_workflow.yml
+++ b/.github/workflows/website_workflow.yml
@@ -38,9 +38,6 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04, macos-latest, windows-latest]
-#        include:
-#          - os: ubuntu-latest
-#            SPHINX_OPTS: "-W"
           
     env:
       DOXYGEN_VERSION: 1.9.1
@@ -51,30 +48,12 @@ jobs:
       - name: Create build directory
         run: mkdir _build
       - name: Install doxygen
-        run: ./website/scripts/install_doxygen.sh ${DOXYGEN_VERSION} ${{ matrix.os }} 
-#        run: |
-#          if [ "${{ matrix.os }}" == "ubuntu-latest" ]; then
-#            sudo apt-get install -y doxygen
-#          elif [ "${{ matrix.os }}" == "macos-latest" ]; then
-#            wget https://github.com/doxygen/doxygen/releases/download/Release_${DOXYGEN_VERSION//./_}/Doxygen-${DOXYGEN_VERSION}.dmg
-#            sudo hdiutil attach Doxygen-${DOXYGEN_VERSION}.dmg
-#            sudo cp /Volumes/Doxygen/Doxygen.app/Contents/MacOS/Doxywizard /usr/local/bin
-#            sudo cp /Volumes/Doxygen/Doxygen.app/Contents/Resources/doxygen /usr/local/bin
-#            sudo cp /Volumes/Doxygen/Doxygen.app/Contents/Resources/doxyindexer /usr/local/bin
-#            sudo hdiutil detach /Volumes/Doxygen
-#          elif [ "${{ matrix.os }}" == "windows-latest" ]; then
-#            mkdir doxygen
-#            cd doxygen
-#            curl -kLSs https://github.com/doxygen/doxygen/releases/download/Release_${DOXYGEN_VERSION//./_}/doxygen-${DOXYGEN_VERSION}.windows.x64.bin.zip -o doxygen.zip
-#            unzip doxygen.zip
-#            cp * c:\\Windows
-#          fi
+        run: ./website/scripts/install_doxygen.sh ${DOXYGEN_VERSION} 
         shell: bash
       - name: Install sphinx requirements
         run: pip3 install -r website/requirements.txt
       - name: Configure
         run: cmake .. -DBUILD_WEBSITE=ON
-#        run: cmake .. -DBUILD_WEBSITE=ON -DSPHINX_OPTS=${{ matrix.SPHINX_OPTS }}
         working-directory: _build
       - name: Build
         run: cmake --build . --target website --config Release
diff --git a/.readthedocs.yml b/.readthedocs.yml
index 8b1718ebbe..0f7e219ed1 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -12,13 +12,6 @@ build:
   os: "ubuntu-22.04"
   tools:
     python: "3.9"
-  apt_packages:
-    - wget        # for test images
-    - imagemagick # for convert, for test images
-    - openexr     # for exrheader, for test images
-  jobs:
-    pre_build:
-       - python website/scripts/test_images.py 
        
 sphinx:
   configuration: website/conf.py
diff --git a/website/scripts/install_doxygen.sh b/website/scripts/install_doxygen.sh
index e07ba4a74d..a2e7e68f76 100755
--- a/website/scripts/install_doxygen.sh
+++ b/website/scripts/install_doxygen.sh
@@ -3,8 +3,6 @@
 set -x
 
 DOXYGEN_VERSION=$1
-OS=$2
-echo "OSTYPE=$OSTYPE"
 
 if [[ $OSTYPE == *linux* ]]; then
     sudo apt-get install -y doxygen
@@ -15,7 +13,7 @@ elif [[ $OSTYPE == *darwin* ]]; then
     sudo cp /Volumes/Doxygen/Doxygen.app/Contents/Resources/doxygen /usr/local/bin
     sudo cp /Volumes/Doxygen/Doxygen.app/Contents/Resources/doxyindexer /usr/local/bin
     sudo hdiutil detach /Volumes/Doxygen
-elif [[ $OSTYPE == *win* ]]; then
+elif [[ $OSTYPE == *msys* ]]; then
     mkdir doxygen
     cd doxygen
     curl -kLSs https://github.com/doxygen/doxygen/releases/download/Release_${DOXYGEN_VERSION//./_}/doxygen-${DOXYGEN_VERSION}.windows.x64.bin.zip -o doxygen.zip