Fix CI script to run the new ffmpeg build script

spacedriveapp · Oct 27, 2023 · cf7c2fd · cf7c2fd
1 parent 20bfaa6
commit cf7c2fd
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 13 deletions.
diff --git a/.github/workflows/ffmpeg-windows.yml → .github/workflows/ffmpeg.yml b/.github/workflows/ffmpeg-windows.yml → .github/workflows/ffmpeg.yml
@@ -1,16 +1,16 @@
-name: Build ffmpeg windows
+name: Build ffmpeg
 
 on:
   push:
     paths:
-      - '.github/workflows/ffmpeg-windows.yml'
-      - '.github/scripts/ffmpeg-windows/**'
+      - '.github/workflows/ffmpeg.yml'
+      - '.github/scripts/ffmpeg/**'
     branches:
       - main
   pull_request:
     paths:
-      - '.github/workflows/ffmpeg-windows.yml'
-      - '.github/scripts/ffmpeg-windows/**'
+      - '.github/workflows/ffmpeg.yml'
+      - '.github/scripts/ffmpeg/**'
   workflow_dispatch:
 
 # Cancel previous runs of the same workflow on the same branch.
@@ -22,9 +22,20 @@ env:
   FFMPEG_VERSION: '6.0'
 
 jobs:
-  build-ffmpeg-windows:
-    name: Build ffmpeg for windows
-    runs-on: ubuntu-20.04
+  build-ffmpeg:
+    strategy:
+      matrix:
+        settings:
+          # - target: x86_64-macos-none
+          # - target: aarch64-macos-none
+          - target: x86_64-windows-gnu
+          - target: aarch64-windows-gnu
+          - target: x86_64-linux-gnu
+          - target: aarch64-linux-gnu
+          # - target: x86-linux-musl
+          # - target: aarch64-linux-musl
+    name: Build ffmpeg ${{ matrix.settings.target }}
+    runs-on: ubuntu-latest
     defaults:
       run:
         shell: bash
@@ -44,12 +55,12 @@ jobs:
       - name: Build ffmpeg
         run: |
           set -euxo pipefail
-          cd .github/scripts/ffmpeg-windows
-          docker build --build-arg FFMPEG_VERSION=$FFMPEG_VERSION -o . .
+          cd .github/scripts/ffmpeg
+          docker build --build-arg TARGET=${{ matrix.settings.target }} -o . .
 
       - name: Publish ffmpeg x86_64
         uses: actions/upload-artifact@v3
         with:
-          name: ffmpeg-${{ env.FFMPEG_VERSION }}-x86_64
+          name: ffmpeg-6.0-x86_64
           path: .github/scripts/ffmpeg-windows/dlls/*
           if-no-files-found: error
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -38,8 +38,6 @@ jobs:
           #   bundles: deb # no appimage for now unfortunetly
           # - host: ubuntu-20.04
           #   target: aarch64-unknown-linux-musl
-          # - host: ubuntu-20.04
-          #   target: armv7-unknown-linux-gnueabihf
     name: Desktop - Main ${{ matrix.settings.target }}
     runs-on: ${{ matrix.settings.host }}
     steps: