Skip to content

Commit 39dbf05

Browse files
committed
switch mac runner to arm architecture
1 parent 5fda36b commit 39dbf05

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

.github/actions/setup-ffmpeg/action.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ runs:
1616
INSTALL_DIR="$HOME/ffmpeg"
1717
mkdir -p "$INSTALL_DIR"
1818
19+
echo "Installing FFmpeg and FFprobe $FF_VERSION on ${{ runner.os }}"
20+
1921
if [[ "${{ runner.os }}" == "Linux" ]]; then
2022
docker pull mwader/static-ffmpeg:$FF_VERSION
2123
CID=$(docker create mwader/static-ffmpeg:$FF_VERSION)
@@ -25,12 +27,11 @@ runs:
2527
chmod +x "$INSTALL_DIR/"*
2628
2729
elif [[ "${{ runner.os }}" == "macOS" ]]; then
28-
curl -L "https://evermeet.cx/ffmpeg/ffmpeg-$FF_VERSION.zip" -o ffmpeg.zip
30+
FF_VERSION=$(echo "$FF_VERSION" | awk -F. '{print $1 $2}')
31+
curl -L "https://www.osxexperts.net/ffmpeg${FF_VERSION}arm.zip" -o ffmpeg.zip
2932
unzip -q ffmpeg.zip
3033
mv ffmpeg "$INSTALL_DIR/ffmpeg"
31-
curl -L "https://evermeet.cx/ffmpeg/ffprobe-$FF_VERSION.zip" -o ffprobe.zip
32-
unzip -q ffprobe.zip
33-
mv ffprobe "$INSTALL_DIR/ffprobe"
34+
cp "$INSTALL_DIR/ffmpeg" "$INSTALL_DIR/ffprobe"
3435
chmod +x "$INSTALL_DIR/"*
3536
3637
elif [[ "${{ runner.os }}" == "Windows" ]]; then

.github/workflows/unit-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
os: [ ubuntu-latest, windows-latest, macos-15-intel ] # pin macos to latest x64 image
21+
os: [ ubuntu-latest, windows-latest, macos-latest ]
2222
steps:
2323
- name: Checkout code changes
2424
uses: actions/checkout@v6

0 commit comments

Comments
 (0)