Add back macOS build, and copy UserGuide & scripts

.github/workflows/build.yml

@@ -23,6 +23,10 @@ jobs:
         strip target/release/bliss-analyser
         mkdir releases
         cp target/release/bliss-analyser releases/bliss-analyser
+        cp UserGuide.md releases/README.md
+        mkdir releases/scripts
+        cp scripts/music-similarity-to-bliss.py releases/scripts
+        cp scripts/README.md releases/scripts
 
     - name: Upload artifacts
       uses: actions/upload-artifact@v2
@@ -30,48 +34,38 @@ jobs:
         name: bliss-analyser-linux
         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
-#
-#    - name: Install Rust support for ARM64 & prepare environment
-#      run: |
-#        rustup target add aarch64-apple-darwin
-#        mkdir releases
-#
-#    - name: Build
-#      run: |
-#        cargo build --release
-#        strip target/release/bliss-analyser
-#        cp target/release/bliss-analyser releases/bliss-analyser-x86_64
-#        cargo build --target=aarch64-apple-darwin --release
-#        strip target/aarch64-apple-darwin/release/bliss-analyser
-#        cp target/aarch64-apple-darwin/release/bliss-analyser releases/bliss-analyser-arm64
-#
-#    - name: Build fat binary
-#      run: |
-#        lipo -create \
-#          -arch x86_64 releases/bliss-analyser-x86_64 \
-#          -arch arm64 releases/bliss-analyser-arm64 \
-#          -output releases/bliss-analyser
-#
-#    - name: Upload artifacts
-#      uses: actions/upload-artifact@v2
-#      with:
-#        name: bliss-analyser-mac
-#        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
+        mkdir releases/scripts
+        cp scripts/music-similarity-to-bliss.py releases/scripts
+        cp scripts/README.md releases/scripts
+
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: bliss-analyser-mac
+        path: releases/
 
   Windows:
     runs-on: windows-2019
@@ -104,6 +98,10 @@ jobs:
         mkdir releases
         cp target/release/bliss-analyser.exe releases/bliss-analyser.exe
         cp deps/bin/*.dll releases/
+        cp UserGuide.md releases/README.md
+        mkdir releases/scripts
+        cp scripts/music-similarity-to-bliss.py releases/scripts
+        cp scripts/README.md releases/scripts
 
     - name: Upload artifacts
       uses: actions/upload-artifact@v2