Merge branch 'develop' of github.com:RBVI/ChimeraX into develop

RBVI · Jan 17, 2025 · ae44bff · ae44bff
2 parents 85f093f + ea28d04
commit ae44bff
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/prereqs/pips/app_requirements.txt b/prereqs/pips/app_requirements.txt
@@ -62,7 +62,7 @@ six==1.16.0
 sortedcontainers==2.4.0
 # Used by the DICOM bundle for a double-ended QSlider
 superqt==0.6.3
-tables==3.10.1
+tables==3.10.2
 tifffile==2024.7.24
 # tinyarray==1.2.4 # 3.11 requires getting this from Plato
 webcolors==24.6.0

diff --git a/utils/ci/consolidated_cache/action.yml b/utils/ci/consolidated_cache/action.yml
@@ -23,7 +23,7 @@ runs:
 
     - name: Restore cached plato pips (Linux)
       id: cache-plato-pips-linux
-      if: ${{ inputs.platform }} == 'linux'
+      if: ${{ inputs.platform == 'linux' }}
       uses: actions/cache@v4
       with:
         path: |
@@ -32,7 +32,7 @@ runs:
 
     - name: Restore cached plato pips (Windows)
       id: cache-plato-pips-windows
-      if: ${{ inputs.platform }} == 'windows'
+      if: ${{ inputs.platform == 'windows' }}
       uses: actions/cache@v4
       with:
         path: |
@@ -41,7 +41,7 @@ runs:
 
     - name: Restore cached plato pips (macOS)
       id: cache-plato-pips-macos
-      if: ${{ inputs.platform }} == 'macos'
+      if: ${{ inputs.platform == 'macos' }}
       uses: actions/cache@v4
       with:
         path: |
@@ -162,7 +162,7 @@ runs:
 
     - name: Restore cached ffmpeg (macOS arm64)
       id: cache-ffmpeg-macos-arm64
-      if: ${{ inputs.platform == 'macos' }}
+      if: ${{ inputs.platform == 'macos' }} && ${{ inputs.architecture == 'arm64' }}
       uses: actions/cache@v4
       with:
         path: |
@@ -171,7 +171,7 @@ runs:
 
     - name: Restore cached ffmpeg (macOS Intel)
       id: cache-ffmpeg-macos-x86_64
-      if: ${{ inputs.platform == 'macos' }}
+      if: ${{ inputs.platform == 'macos' }} && ${{ inputs.architecture == 'x86_64' }}
       uses: actions/cache@v4
       with:
         path: |