diff --git a/.github/actions/setup-ffmpeg/action.yml b/.github/actions/setup-ffmpeg/action.yml index 719d4f6e..d4c8ccec 100644 --- a/.github/actions/setup-ffmpeg/action.yml +++ b/.github/actions/setup-ffmpeg/action.yml @@ -23,9 +23,14 @@ runs: local binary_name="${2:-FFmpeg}" local output_file="$(echo "$binary_name" | tr '[:upper:]' '[:lower:]').zip" - curl -sS -f -L --retry 3 --retry-delay 5 "$url" -o "$output_file" -w "Downloaded $binary_name from %{url_effective}\n" - unzip -q "$output_file" - rm -f "$output_file" + if curl -sS -f -L --retry 3 --retry-delay 5 "$url" -o "$output_file"; then + echo "Downloaded $binary_name from $url" + unzip -q "$output_file" + rm -f "$output_file" + else + echo "Failed to download $binary_name from $url" + return 1 + fi } if [[ "${{ runner.os }}" == "Linux" ]]; then diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 42eb83f4..0254a3d2 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -27,7 +27,7 @@ jobs: uses: ./.github/actions/setup-ffmpeg with: # bump: FFmpeg /ffmpeg-version: ([\d.]+)/ docker:mwader/static-ffmpeg|/\d+\./|* - ffmpeg-version: 8.1.1 + ffmpeg-version: 8.1.2 - name: Setup Java uses: actions/setup-java@v5 diff --git a/Dockerfile b/Dockerfile index 7eca76a6..4f143d7e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM eclipse-temurin:26-alpine AS builder WORKDIR /app # bump: FFmpeg /static-ffmpeg:([\d.]+)/ docker:mwader/static-ffmpeg|/\d+\./|* -COPY --from=mwader/static-ffmpeg:8.1.1 /ff* /usr/bin/ +COPY --from=mwader/static-ffmpeg:8.1.2 /ff* /usr/bin/ COPY . . RUN --mount=type=cache,target=/root/.gradle ./gradlew check installDist --no-daemon