ci: Forgot to actually get Linux ffmpeg dependencies

RBVI · Oct 31, 2024 · a08eb90 · a08eb90
1 parent 4c615c4
commit a08eb90
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/utils/ci/consolidated_cache/action.yml b/utils/ci/consolidated_cache/action.yml
@@ -59,7 +59,7 @@ runs:
           prereqs/pips/qtshim-1.0-py3-none-any.whl
         key: generic-plato-pips
 
-    - name: Restore cached Python
+    - name: Restore cached Python (Linux)
       id: cache-python-linux
       if: ${{ inputs.platform == 'linux' }}
       uses: actions/cache@v4
@@ -68,7 +68,7 @@ runs:
           prereqs/Python/python-3.11.4.tar.xz
         key: ${{ runner.os }}-${{ inputs.architecture }}-python
 
-    - name: Restore cached Python
+    - name: Restore cached Python (Windows)
       id: cache-python-windows
       if: ${{ inputs.platform == 'windows' }}
       uses: actions/cache@v4
@@ -77,7 +77,7 @@ runs:
           prereqs/Python/python-3.11.4-win-amd64.tar.bz2
         key: ${{ runner.os }}-${{ inputs.architecture }}-python
 
-    - name: Restore cached Python
+    - name: Restore cached Python (macOS)
       id: cache-python-macos
       if: ${{ inputs.platform == 'macos' }}
       uses: actions/cache@v4
@@ -104,7 +104,7 @@ runs:
           prereqs/ambertools/ambertools-20-Linux-Rocky-8.10.tar.bz2
         key: ${{ runner.os }}-${{ inputs.architecture }}-ambertools
 
-    - name: Restore cached ambertools and PyQt6-WebEngine (Windows)
+    - name: Restore cached ambertools (Windows)
       id: cache-ambertools-windows
       if: ${{ inputs.platform == 'windows' }}
       uses: actions/cache@v4
@@ -297,7 +297,12 @@ runs:
       if: ${{ steps[format('cache-ffmpeg-{0}-{1}', inputs.platform, inputs.architecture)].outputs.cache-hit != 'true' }}
       run: |
         if [ "${{ inputs.platform }}" = "linux" ] ; then
-          curl https://www.rbvi.ucsf.edu/chimerax/data/prereqs/ffmpeg/
+          curl https://www.rbvi.ucsf.edu/chimerax/data/prereqs/ffmpeg/ffmpeg-3.2.4.tar.bz2
+          curl https://www.rbvi.ucsf.edu/chimerax/data/prereqs/ffmpeg/libtheora-1.1.1.tar.xz
+          curl https://www.rbvi.ucsf.edu/chimerax/data/prereqs/ffmpeg/libogg-1.3.2.tar.xz
+          curl https://www.rbvi.ucsf.edu/chimerax/data/prereqs/ffmpeg/libvpx-1.6.1.tar.xz
+          curl https://www.rbvi.ucsf.edu/chimerax/data/prereqs/ffmpeg/yasm-1.3.0.tar.bz2
+          curl https://www.rbvi.ucsf.edu/chimerax/data/prereqs/ffmpeg/x264-20170123-90a61ec.tar.xz
           mv libtheora* prereqs/ffmpeg/
           mv libogg* prereqs/ffmpeg/
           mv libvpx* prereqs/ffmpeg/