Revert ffmpeg apt steps, and disable macOS builds (failing!)

CDrummond · Aug 10, 2023 · fe65d35 · fe65d35
1 parent 75aeee1
commit fe65d35
Showing 1 changed file with 33 additions and 32 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -41,7 +41,7 @@ jobs:
       uses: actions/checkout@v1
 
     - name: Packages
-      run: sudo apt-get update && sudo apt-get install build-essential yasm libavutil-dev libavcodec-dev libavformat-dev libavfilter-dev libavdevice-dev libswresample-dev libfftw3-dev ffmpeg -y
+      run: sudo add-apt-repository ppa:savoury1/ffmpeg4 -y && sudo add-apt-repository ppa:savoury1/ffmpeg5 -y && sudo apt-get update && sudo apt-get install build-essential yasm libavutil-dev libavcodec-dev libavformat-dev libavfilter-dev libavdevice-dev libswresample-dev libfftw3-dev ffmpeg -y
 
     - name: Build
       run: |
@@ -78,37 +78,38 @@ jobs:
         name: bliss-analyser-linux-arm
         path: releases/
 
-  macOS:
-    runs-on: macos-11.0
-
-    steps:
-    - name: Install Rust
-      uses: actions-rs/toolchain@v1
-      with:
-          toolchain: stable
-
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - name: Install deps
-      run: |
-        brew install ffmpeg@5
-
-    - name: Build
-      run: |
-        mkdir releases
-        cargo build --release
-        strip target/release/bliss-analyser
-        cp target/release/bliss-analyser releases/bliss-analyser
-        cp UserGuide.md releases/README.md
-        cp LICENSE releases/
-        cp configs/macos.ini releases/config.ini
-
-    - name: Upload artifacts
-      uses: actions/upload-artifact@v2
-      with:
-        name: bliss-analyser-mac
-        path: releases/
+# macOs builds are failing: error: could not find system library 'libavutil' required by the 'ffmpeg-sys-next' crate
+#  macOS:
+#    runs-on: macos-11.0
+#
+#    steps:
+#    - name: Install Rust
+#      uses: actions-rs/toolchain@v1
+#      with:
+#          toolchain: stable
+#
+#    - name: Checkout
+#      uses: actions/checkout@v2
+#
+#    - name: Install deps
+#      run: |
+#        brew install ffmpeg@5
+#
+#    - name: Build
+#      run: |
+#        mkdir releases
+#        cargo build --release
+#        strip target/release/bliss-analyser
+#        cp target/release/bliss-analyser releases/bliss-analyser
+#        cp UserGuide.md releases/README.md
+#        cp LICENSE releases/
+#        cp configs/macos.ini releases/config.ini
+#
+#    - name: Upload artifacts
+#      uses: actions/upload-artifact@v2
+#      with:
+#        name: bliss-analyser-mac
+#        path: releases/
 
 
   Windows: