From f5bff5202d50bf393ebb2d6280f67e9174cd7a3a Mon Sep 17 00:00:00 2001
From: Zach Pearson <zjp@cgl.ucsf.edu>
Date: Fri, 17 Jan 2025 14:07:52 -0800
Subject: [PATCH] ci: Revert to PyQt 6.7

This reverts commits c62bf0508236dd0f6f850b0e6e4acfa82d586532 and 5470771d8ceb047a57b87d3509860519f85b9580
---
 utils/ci/consolidated_cache/action.yml | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/utils/ci/consolidated_cache/action.yml b/utils/ci/consolidated_cache/action.yml
index f5095653bf..76dea422a5 100644
--- a/utils/ci/consolidated_cache/action.yml
+++ b/utils/ci/consolidated_cache/action.yml
@@ -184,8 +184,8 @@ runs:
       uses: actions/cache@v4
       with:
         path: |
-          prereqs/PyQt/PyQt6_commercial-6.8.0-cp39-abi3-manylinux_2_28_x86_64.whl
-          prereqs/PyQt/PyQt6_WebEngine_commercial-6.8.0-cp39-abi3-manylinux_2_28_x86_64.whl
+          prereqs/PyQt/PyQt6_commercial-6.7.1-1-cp38-abi3-manylinux_2_28_x86_64.whl
+          prereqs/PyQt/PyQt6_WebEngine_commercial-6.7.0-cp38-abi3-manylinux_2_28_x86_64.whl
         key: ${{ runner.os }}-${{ inputs.architecture }}-pyqt6
 
     - name: Restore cached PyQt6 and PyQt6-WebEngine (Windows)
@@ -194,8 +194,8 @@ runs:
       uses: actions/cache@v4
       with:
         path: |
-          prereqs/PyQt/PyQt6_commercial-6.8.0-cp39-abi3-win_amd64.whl
-          prereqs/PyQt/PyQt6_WebEngine_commercial-6.8.0-cp39-abi3-win_amd64.whl
+          prereqs/PyQt/PyQt6_commercial-6.7.1-cp38-abi3-win_amd64.whl
+          prereqs/PyQt/PyQt6_WebEngine_commercial-6.7.0-cp38-abi3-win_amd64.whl
         key: ${{ runner.os }}-${{ inputs.architecture }}-pyqt6
 
     - name: Restore cached PyQt6 and PyQt6-WebEngine (macOS)
@@ -204,8 +204,8 @@ runs:
       uses: actions/cache@v4
       with:
         path: |
-          prereqs/PyQt/PyQt6_commercial-6.8.0-cp39-abi3-macosx_10_14_universal2.whl
-          prereqs/PyQt/PyQt6_WebEngine_commercial-6.8.0-cp39-abi3-macosx_10_14_universal2.whl
+          prereqs/PyQt/PyQt6_commercial-6.7.1-cp38-abi3-macosx_11_0_universal2.whl
+          prereqs/PyQt/PyQt6_WebEngine_commercial-6.7.0-cp38-abi3-macosx_10_14_universal2.whl
         key: ${{ runner.os }}-${{ inputs.architecture }}-pyqt6
 
     - name: Restore cached seggerx dependency sources
@@ -242,8 +242,12 @@ runs:
       shell: bash
       if: ${{ steps[format('cache-pyqt6-{0}', inputs.platform)].outputs.cache-hit != 'true' }}
       run: |
-        export PYQT_VERSION=6.8.0
-        export PYQTWE_VERSION=6.8.0
+        if [ "${{ inputs.platform }}" = "linux" ] ; then
+          export PYQT_VERSION=6.7.1-1
+        else
+          export PYQT_VERSION=6.7.1
+        fi
+        export PYQTWE_VERSION=6.7.0
         export PYQT_URL="https://preview.rbvi.ucsf.edu/chimerax/cgi-bin/get_pyqt.py?platform=${{ inputs.platform }}&version=${PYQT_VERSION}&webengine=false&architecture=${{ inputs.architecture }}"
         export PYQTWE_URL="https://preview.rbvi.ucsf.edu/chimerax/cgi-bin/get_pyqt.py?platform=${{ inputs.platform }}&version=${PYQTWE_VERSION}&webengine=true&architecture=${{ inputs.architecture }}"
         curl -H "X-API-KEY: ${{ inputs.cache_key }}" ${PYQT_URL} -O -J