diff --git a/.github/actions/reusable-prepare-peertube-run/action.yml b/.github/actions/reusable-prepare-peertube-run/action.yml index aa5b897c9ff..bb7840514e9 100644 --- a/.github/actions/reusable-prepare-peertube-run/action.yml +++ b/.github/actions/reusable-prepare-peertube-run/action.yml @@ -8,9 +8,10 @@ runs: - name: Setup system dependencies shell: bash run: | - sudo apt-get install postgresql-client-common redis-tools parallel libimage-exiftool-perl - wget --quiet --no-check-certificate "https://download.cpy.re/ffmpeg/ffmpeg-release-4.3.1-64bit-static.tar.xz" - tar xf ffmpeg-release-4.3.1-64bit-static.tar.xz + sudo apt-get install postgresql-client-common redis-tools parallel libimage-exiftool-perl ffmpeg + sudo rm /usr/bin/ffmpeg # Use our static version of ffmpeg + wget --quiet --no-check-certificate "https://download.cpy.re/ffmpeg/ffmpeg-release-4.4.1-64bit-static.tar.xz" + tar xf ffmpeg-release-4.4.1-64bit-static.tar.xz mkdir -p $HOME/bin - cp ffmpeg-*/{ffmpeg,ffprobe} $HOME/bin + cp ffmpeg-4.4.1-amd64-static/ffmpeg $HOME/bin echo "$HOME/bin" >> $GITHUB_PATH diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4fe94e86550..8ddbab93b1a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -100,7 +100,10 @@ jobs: if: github.event_name == 'schedule' || matrix.test_suite != 'external-plugins' env: AKISMET_KEY: ${{ secrets.AKISMET_KEY }} - run: npm run ci -- ${{ matrix.test_suite }} + run: | + ffmpeg -version + ffprobe -version + npm run ci -- ${{ matrix.test_suite }} - name: Display errors if: ${{ always() }}