diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d8c0e0a..8c6f2bc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,7 +7,7 @@ env: CARGO_TERM_COLOR: always jobs: - Linux: + Linux (ffmpeg4): runs-on: ubuntu-20.04 steps: @@ -15,8 +15,8 @@ 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 libavfilter-dev libavdevice-dev libswresample-dev libfftw3-dev ffmpeg - + run: sudo apt-get update && sudo apt-get install build-essential yasm libavutil-dev libavcodec-dev libavformat-dev libavfilter-dev libavfilter-dev libavdevice-dev libswresample-dev libfftw3-dev ffmpeg -y + - name: Build run: | cargo build --release @@ -30,9 +30,35 @@ jobs: - name: Upload artifacts uses: actions/upload-artifact@v2 with: - name: bliss-analyser-linux + name: bliss-analyser-linux-x86-ffmpeg4 path: releases/ + Linux (ffmpeg5): + runs-on: ubuntu-20.04 + + steps: + - name: Checkout + uses: actions/checkout@v1 + + - name: Packages + run: sudo add-apt-repository ppa:savoury1/ffmpeg4 -y && sudo add-apt-repository ppa:savoury1/ffmpeg5 -y + run: sudo apt-get update && sudo apt-get install build-essential yasm libavutil-dev libavcodec-dev libavformat-dev libavfilter-dev libavfilter-dev libavdevice-dev libswresample-dev libfftw3-dev ffmpeg -y + + - name: Build + run: | + cargo build --release + strip target/release/bliss-analyser + mkdir releases + cp target/release/bliss-analyser releases/bliss-analyser + cp UserGuide.md releases/README.md + cp LICENSE releases/ + cp configs/linux.ini releases/config.ini + + - name: Upload artifacts + uses: actions/upload-artifact@v2 + with: + name: bliss-analyser-linux-x86-ffmpeg5 + path: releases/ macOS: runs-on: macos-11.0 diff --git a/download.py b/download.py index 258b042..d652a37 100755 --- a/download.py +++ b/download.py @@ -11,7 +11,7 @@ import datetime, os, requests, shutil, subprocess, sys, tempfile, time GITHUB_TOKEN_FILE = "%s/.config/github-token" % os.path.expanduser('~') GITHUB_REPO = "CDrummond/bliss-analyser" -GITHUB_ARTIFACTS = ["bliss-analyser-linux", "bliss-analyser-mac", "bliss-analyser-windows"] +GITHUB_ARTIFACTS = ["bliss-analyser-linux-x86-ffmpeg4", "bliss-analyser-linux-x86-ffmpeg5", "bliss-analyser-mac", "bliss-analyser-windows"] def info(s): print("INFO: %s" %s) @@ -69,7 +69,7 @@ def download_artifacts(version): def make_executable(version): cwd = os.getcwd() - for a in ["bliss-analyser-linux", "bliss-analyser-mac"]: + for a in ["bliss-analyser-linux-x86-ffmpeg4", "bliss-analyser-linux-x86-ffmpeg5", "bliss-analyser-mac"]: archive = "%s-%s.zip" % (a, version) info("Making analyser executable in %s" % archive) with tempfile.TemporaryDirectory() as td: