File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 2323 local binary_name="${2:-FFmpeg}"
2424 local output_file="$(echo "$binary_name" | tr '[:upper:]' '[:lower:]').zip"
2525
26- if curl -sS -f -L --retry 3 --retry-delay 5 "$url" -o "$output_file"; then
26+ if curl -sS -f -L --retry 3 --retry-delay 8 --retry-all-errors "$url" -o "$output_file"; then
2727 echo "Downloaded $binary_name from $url"
2828 unzip -q "$output_file"
2929 rm -f "$output_file"
4242 chmod +x "$INSTALL_DIR/"*
4343
4444 elif [[ "${{ runner.os }}" == "macOS" ]]; then
45- FF_VERSION=$(echo "$FF_VERSION" | awk -F. '{print $1 $2}')
45+ major=$(echo "$FF_VERSION" | cut -d. -f1)
46+ minor=$(echo "$FF_VERSION" | cut -d. -f2 | sed 's/^0*//')
47+ FF_VERSION="${major}${minor}"
48+ if [[ -z "$minor" ]]; then
49+ FF_VERSION="$major"
50+ fi
51+
4652 download_binary "https://www.osxexperts.net/ffmpeg${FF_VERSION}arm.zip"
4753 mv ffmpeg "$INSTALL_DIR/ffmpeg"
4854 download_binary "https://www.osxexperts.net/ffprobe${FF_VERSION}arm.zip" "FFprobe"
Original file line number Diff line number Diff line change 2626 - name : Setup FFmpeg and FFprobe
2727 uses : ./.github/actions/setup-ffmpeg
2828 with :
29- # bump: FFmpeg /ffmpeg-version: ([\d.]+)/ docker:mwader/static-ffmpeg|/\d+\./|*
30- ffmpeg-version : 8.1.2
29+ # bump: FFmpeg /ffmpeg-version: ' ([\d.]+)' / docker:mwader/static-ffmpeg|/\d+\./|*
30+ ffmpeg-version : ' 9.0 '
3131
3232 - name : Setup Java
3333 uses : actions/setup-java@v5
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ FROM eclipse-temurin:26-alpine AS builder
33WORKDIR /app
44
55# bump: FFmpeg /static-ffmpeg:([\d.]+)/ docker:mwader/static-ffmpeg|/\d+\./|*
6- COPY --from=mwader/static-ffmpeg:8.1.2 /ff* /usr/bin/
6+ COPY --from=mwader/static-ffmpeg:9.0 /ff* /usr/bin/
77
88COPY . .
99RUN --mount=type=cache,target=/root/.gradle ./gradlew check installDist --no-daemon
You can’t perform that action at this time.
0 commit comments