From 5e3b05116b71801f7e6ecc21eabf5558ce7d7d7f Mon Sep 17 00:00:00 2001 From: Michael Welter Date: Sun, 30 Jun 2024 13:36:01 +0200 Subject: [PATCH 1/4] Attempt 1 --- .github/workflows/python-package.yml | 40 +++++++++++++++++++--------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index a5a4286..ed725f7 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -17,14 +17,21 @@ jobs: fail-fast: false matrix: include: - - os: "ubuntu-18.04" - python-version: "3.6" - os: "ubuntu-20.04" python-version: "3.8" - - os: "ubuntu-latest" - python-version: "3.11" - - os: "macos-latest" + use-ffmpeg: false + - os: "ubuntu-22.04" + python-version: "3.12" + use-ffmpeg: false + - os: "ubuntu-24.04" + python-version: "3.12" + use-ffmpeg: true + - os: "macos-12" python-version: "3.11" + use-ffmpeg: true + - os: "macos-14" + python-version: "3.12" + use-ffmpeg: true runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 @@ -34,22 +41,29 @@ jobs: python-version: ${{ matrix.python-version }} cache: 'pip' - - name: Install dependencies Ubuntu - if: ${{ contains(matrix.os,'ubuntu') }} + - name: Install Python Dependencies run: | python -m pip install --upgrade pip python -m pip install flake8 pytest python -m pip install -r requirements.txt + + - name: Install libavutil on Ubuntu + if: ${{ contains(matrix.os,'ubuntu') && !matrix.use-ffmpeg }} + run: | sudo apt-get update -y sudo apt-get install -y libavcodec-dev libavutil-dev libswscale-dev - - name: Install dependencies OS X - if: ${{ contains(matrix.os,'macos') }} + - name: Install ffmpeg on Ubuntu + if: ${{ contains(matrix.os,'ubuntu') && matrix.use-ffmpeg }} run: | - python -m pip install --upgrade pip - python -m pip install flake8 pytest - python -m pip install -r requirements.txt - brew install ffmpeg@5 cmake + sudo apt-get update -y + sudo apt-get install -y ffmpeg + + - name: Install ffmpeg on OS X + if: ${{ contains(matrix.os,'ubuntu') && !matrix.use-ffmpeg }} + run: | + brew update + brew install ffmpeg cmake - name: Build And Install run: | From 7b43c1292483edd3c1378ee8809ccc9550915466 Mon Sep 17 00:00:00 2001 From: Michael Welter Date: Sun, 30 Jun 2024 13:43:09 +0200 Subject: [PATCH 2/4] fix --- .github/workflows/python-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index ed725f7..bdb4c63 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -60,7 +60,7 @@ jobs: sudo apt-get install -y ffmpeg - name: Install ffmpeg on OS X - if: ${{ contains(matrix.os,'ubuntu') && !matrix.use-ffmpeg }} + if: ${{ contains(matrix.os,'macos') && !matrix.use-ffmpeg }} run: | brew update brew install ffmpeg cmake From 3364c19eb86baa610a0c270d8e9524ea861eeb79 Mon Sep 17 00:00:00 2001 From: Michael Welter Date: Sun, 30 Jun 2024 13:57:05 +0200 Subject: [PATCH 3/4] fix 2 --- .github/workflows/python-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index bdb4c63..aa50c10 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -57,7 +57,7 @@ jobs: if: ${{ contains(matrix.os,'ubuntu') && matrix.use-ffmpeg }} run: | sudo apt-get update -y - sudo apt-get install -y ffmpeg + sudo apt-get install -y libavcodec-dev libavutil-dev libswscale-dev - name: Install ffmpeg on OS X if: ${{ contains(matrix.os,'macos') && !matrix.use-ffmpeg }} From fdb9c17283c323ea8322dffc5b4fb3411c0a6ad9 Mon Sep 17 00:00:00 2001 From: Michael Welter Date: Sun, 30 Jun 2024 14:02:20 +0200 Subject: [PATCH 4/4] fix 3 --- .github/workflows/python-package.yml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index aa50c10..b2124f3 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -19,19 +19,14 @@ jobs: include: - os: "ubuntu-20.04" python-version: "3.8" - use-ffmpeg: false - os: "ubuntu-22.04" python-version: "3.12" - use-ffmpeg: false - os: "ubuntu-24.04" python-version: "3.12" - use-ffmpeg: true - os: "macos-12" python-version: "3.11" - use-ffmpeg: true - os: "macos-14" python-version: "3.12" - use-ffmpeg: true runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 @@ -47,20 +42,14 @@ jobs: python -m pip install flake8 pytest python -m pip install -r requirements.txt - - name: Install libavutil on Ubuntu - if: ${{ contains(matrix.os,'ubuntu') && !matrix.use-ffmpeg }} - run: | - sudo apt-get update -y - sudo apt-get install -y libavcodec-dev libavutil-dev libswscale-dev - - name: Install ffmpeg on Ubuntu - if: ${{ contains(matrix.os,'ubuntu') && matrix.use-ffmpeg }} + if: ${{ contains(matrix.os,'ubuntu') }} run: | sudo apt-get update -y sudo apt-get install -y libavcodec-dev libavutil-dev libswscale-dev - name: Install ffmpeg on OS X - if: ${{ contains(matrix.os,'macos') && !matrix.use-ffmpeg }} + if: ${{ contains(matrix.os,'macos') }} run: | brew update brew install ffmpeg cmake