deblan-mirror/buzz
1
0
Fork 0
mirror of https://github.com/chidiwilliams/buzz.git synced 2026-03-18 08:29:53 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add ARM build

Browse source
This commit is contained in:
Chidi Williams 2023-01-15 13:47:29 +00:00
commit fcc0c4ad10
3 changed files with 167 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

128
.github/workflows/ci.yml → .github/workflows/bundle.yml vendored
View file

@ -1,5 +1,5 @@
---
name: CI
name: Bundle
on:
push:
branches:
@ -13,21 +13,12 @@ concurrency:
cancel-in-progress: true
jobs:
test:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
include:
- os: macos-latest
- os: macos-latest
arm: true
- os: windows-latest
windows-latest:
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
with:
submodules: recursive
- uses: actions/setup-python@v4
with:
python-version: '3.10.7'
@ -45,17 +36,6 @@ jobs:
path: .venv
key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}-2
- name: Load cached Whisper models
id: cached-whisper-models
uses: actions/cache@v3
with:
path: |
~/Library/Caches/Buzz
~/.cache/whisper
~/.cache/huggingface
~/AppData/Local/Buzz/Buzz/Cache
key: whisper-models-${{ runner.os }}
- uses: FedericoCarboni/setup-ffmpeg@v1
id: setup-ffmpeg
with:
@ -64,31 +44,22 @@ jobs:
- name: Install dependencies
run: poetry config experimental.new-installer false && poetry install
- name: Test
run: |
if [ "$ARM" == "true" ]; then
poetry run make whisper_cpp CMAKE_FLAGS="-DWHISPER_NO_AVX=ON -DWHISPER_NO_AVX2=ON -DWHISPER_NO_FMA=ON"
fi
poetry run make test
shell: bash
env:
ARM: ${{ matrix.arm }}
- name: Bundle
run: poetry run make bundle_windows
- name: Upload coverage reports to Codecov with GitHub Action
uses: codecov/codecov-action@v3
- uses: actions/upload-artifact@v3
with:
flags: ${{ runner.os }}
name: Buzz-Windows
path: |
dist/Buzz*-windows.tar.gz
dist/Buzz*-windows.exe
build:
runs-on: ${{ matrix.os }}
macos-latest:
runs-on: macos-latest
strategy:
fail-fast: false
matrix:
include:
- os: macos-latest
- os: macos-latest
arm: true
- os: windows-latest
cpu: [ intel, arm ]
steps:
- uses: actions/checkout@v3
with:
@ -120,44 +91,34 @@ jobs:
- name: Bundle
run: |
if [ "$RUNNER_OS" == "macOS" ]; then
brew install create-dmg
# create variables
CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
# import certificate and provisioning profile from secrets
echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode --output $CERTIFICATE_PATH
# create temporary keychain
security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
# import certificate to keychain
security import $CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
security list-keychain -d user -s $KEYCHAIN_PATH
# store notarytool credentials
xcrun notarytool store-credentials --apple-id "$APPLE_ID" --password "$APPLE_APP_PASSWORD" --team-id "$APPLE_TEAM_ID" notarytool --validate
brew install create-dmg
if [ "$ARM" == "true" ]; then
poetry run make whisper_cpp CMAKE_FLAGS="-DWHISPER_NO_AVX=ON -DWHISPER_NO_AVX2=ON -DWHISPER_NO_FMA=ON"
fi
poetry run make bundle_mac
elif [ "$RUNNER_OS" == "Windows" ]; then
poetry run make bundle_windows
elif [ "$RUNNER_OS" == "Linux" ]; then
poetry run make bundle_linux
# create variables
CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
# import certificate and provisioning profile from secrets
echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode --output $CERTIFICATE_PATH
# create temporary keychain
security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
# import certificate to keychain
security import $CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
security list-keychain -d user -s $KEYCHAIN_PATH
# store notarytool credentials
xcrun notarytool store-credentials --apple-id "$APPLE_ID" --password "$APPLE_APP_PASSWORD" --team-id "$APPLE_TEAM_ID" notarytool --validate
if [[ ${{ matrix.cpu }} == "intel" ]]; then
poetry run make test;
else
poetry run make whisper_cpp CMAKE_FLAGS="-DWHISPER_NO_AVX=ON -DWHISPER_NO_AVX2=ON -DWHISPER_NO_FMA=ON";
fi
poetry run make bundle_mac
env:
BUZZ_CODESIGN_IDENTITY: ${{ secrets.BUZZ_CODESIGN_IDENTITY }}
BUZZ_KEYCHAIN_NOTARY_PROFILE: ${{ secrets.BUZZ_KEYCHAIN_NOTARY_PROFILE }}
@ -167,14 +128,11 @@ jobs:
APPLE_ID: ${{ secrets.APPLE_ID }}
APPLE_APP_PASSWORD: ${{ secrets.APPLE_APP_PASSWORD }}
APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
shell: bash
- uses: actions/upload-artifact@v3
with:
name: Buzz-${{ runner.os }}-${{ matrix.arm }}
name: Buzz-${{ runner.os }}-${{ matrix.cpu }}
path: |
dist/Buzz*-windows.tar.gz
dist/Buzz*-windows.exe
dist/Buzz*-mac.dmg
release:
@ -182,10 +140,8 @@ jobs:
strategy:
fail-fast: false
matrix:
include:
- os: macos-latest
- os: windows-latest
needs: [ build, test ]
os: [ macos-latest, windows-latest ]
needs: [ build, test ] # TODO
if: startsWith(github.ref, 'refs/tags/')
steps:
- uses: actions/checkout@v3

121
.github/workflows/test.yml vendored Normal file
View file

@ -0,0 +1,121 @@
---
name: Test
on:
push:
branches:
- main
tags:
- '*'
pull_request:
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
jobs:
windows-latest:
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
with:
submodules: recursive
- uses: actions/setup-python@v4
with:
python-version: '3.10.7'
- name: Install Poetry Action
uses: snok/install-poetry@v1.3.1
with:
virtualenvs-create: true
virtualenvs-in-project: true
- name: Load cached venv
id: cached-poetry-dependencies
uses: actions/cache@v3
with:
path: .venv
key: venv-Windows-${{ hashFiles('**/poetry.lock') }}-2
- name: Load cached Whisper models
id: cached-whisper-models
uses: actions/cache@v3
with:
path: |
~/.cache/whisper
~/.cache/huggingface
~/AppData/Local/Buzz/Buzz/Cache
key: whisper-models-Windows
- uses: FedericoCarboni/setup-ffmpeg@v1
id: setup-ffmpeg
with:
token: ${{ secrets.GITHUB_TOKEN }}
- name: Install dependencies
run: poetry config experimental.new-installer false && poetry install
- name: Test
run: poetry run make test
- name: Upload coverage reports to Codecov with GitHub Action
uses: codecov/codecov-action@v3
with:
flags: Windows
macos-latest:
runs-on: macos-latest
matrix:
cpu: [ intel, arm ]
steps:
- uses: actions/checkout@v3
with:
submodules: recursive
- uses: actions/setup-python@v4
with:
python-version: '3.10.7'
- name: Install Poetry Action
uses: snok/install-poetry@v1.3.1
with:
virtualenvs-create: true
virtualenvs-in-project: true
- name: Load cached venv
id: cached-poetry-dependencies
uses: actions/cache@v3
with:
path: .venv
key: venv-macOS-${{ hashFiles('**/poetry.lock') }}-2
- name: Load cached Whisper models
id: cached-whisper-models
uses: actions/cache@v3
with:
path: |
~/Library/Caches/Buzz
~/.cache/whisper
~/.cache/huggingface
key: whisper-models-macOS
- uses: FedericoCarboni/setup-ffmpeg@v1
id: setup-ffmpeg
with:
token: ${{ secrets.GITHUB_TOKEN }}
- name: Install dependencies
run: poetry config experimental.new-installer false && poetry install
- name: Test
run: |
if [[ ${{ matrix.cpu }} == "intel" ]]; then
poetry run make test;
else
poetry run make whisper_cpp CMAKE_FLAGS="-DWHISPER_NO_AVX=ON -DWHISPER_NO_AVX2=ON -DWHISPER_NO_FMA=ON";
fi
- name: Upload coverage reports to Codecov with GitHub Action
uses: codecov/codecov-action@v3
with:
flags: macOS-${{ matrix.cpu }}

4
Makefile
View file

@ -42,6 +42,10 @@ test: buzz/whisper_cpp.py translation_mo
dist/Buzz dist/Buzz.app: buzz/whisper_cpp.py translation_mo
pyinstaller --noconfirm Buzz.spec
# Add @executable_path as an rpath to the binary so it can pick up libwhisper shared library
ifeq ($(UNAME_S),Darwin)
install_name_tool -add_rpath @executable_path/. dist/Buzz.app/Contents/Resources/whisper_cpp
endif
version:
poetry version ${version}