-
Notifications
You must be signed in to change notification settings - Fork 995
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Will use previous ffmpeg action on Intel Macs (#1061)
- Loading branch information
1 parent
8ac5172
commit 56263c7
Showing
1 changed file
with
28 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -60,6 +60,18 @@ jobs: | |
|
||
- uses: AnimMouse/setup-ffmpeg@v1 | ||
id: setup-ffmpeg | ||
if: matrix.os != 'macos-13' | ||
|
||
- uses: FedericoCarboni/[email protected] | ||
id: setup-ffmpeg-macos-13 | ||
if: matrix.os == 'macos-13' | ||
with: | ||
ffmpeg-version: release | ||
architecture: 'x64' | ||
github-token: ${{ github.server_url == 'https://github.com' && github.token || '' }} | ||
|
||
- name: Test ffmpeg | ||
run: ffmpeg -i ./testdata/audio-long.mp3 ./testdata/audio-long.wav | ||
|
||
- name: Install dependencies | ||
run: poetry install | ||
|
@@ -119,14 +131,23 @@ jobs: | |
|
||
- uses: AnimMouse/setup-ffmpeg@v1 | ||
id: setup-ffmpeg | ||
if: matrix.os != 'macos-13' | ||
|
||
- uses: FedericoCarboni/[email protected] | ||
id: setup-ffmpeg-macos-13 | ||
if: matrix.os == 'macos-13' | ||
with: | ||
ffmpeg-version: release | ||
architecture: 'x64' | ||
github-token: ${{ github.server_url == 'https://github.com' && github.token || '' }} | ||
|
||
- name: Install dependencies | ||
run: poetry install | ||
|
||
- uses: ruby/setup-ruby@v1 | ||
with: | ||
ruby-version: "3.0" # Not needed with a .ruby-version file | ||
bundler-cache: true # runs 'bundle install' and caches installed gems automatically | ||
ruby-version: "3.0" # Not needed with a .ruby-version file | ||
bundler-cache: true # runs 'bundle install' and caches installed gems automatically | ||
if: "startsWith(matrix.os, 'ubuntu-')" | ||
|
||
- name: Install apt dependencies | ||
|
@@ -147,8 +168,8 @@ jobs: | |
if [ "$RUNNER_OS" == "macOS" ]; then | ||
brew install create-dmg | ||
# kill XProtect to prevent https://github.com/actions/runner-images/issues/7522 | ||
# kill XProtect to prevent https://github.com/actions/runner-images/issues/7522 | ||
sudo pkill -9 XProtect >/dev/null || true; | ||
while pgrep XProtect; do sleep 3; done; | ||
|
@@ -230,7 +251,7 @@ jobs: | |
path: ./wheelhouse/*.whl | ||
|
||
publish_pypi: | ||
needs: [ build_wheels, test ] | ||
needs: [build_wheels, test] | ||
runs-on: ubuntu-latest | ||
environment: pypi | ||
permissions: | ||
|
@@ -257,7 +278,7 @@ jobs: | |
- os: macos-13 | ||
- os: macos-latest | ||
- os: windows-latest | ||
needs: [ build, test ] | ||
needs: [build, test] | ||
if: startsWith(github.ref, 'refs/tags/') | ||
steps: | ||
- uses: actions/checkout@v4 | ||
|
@@ -291,7 +312,7 @@ jobs: | |
deploy_brew_cask: | ||
runs-on: macos-latest | ||
needs: [ release ] | ||
needs: [release] | ||
if: startsWith(github.ref, 'refs/tags/') | ||
steps: | ||
- uses: actions/checkout@v4 | ||
|