Skip to content

Commit

Permalink
try fix
Browse files Browse the repository at this point in the history
  • Loading branch information
albho committed Sep 16, 2024
1 parent 637d6b5 commit 8b7b133
Show file tree
Hide file tree
Showing 10 changed files with 33 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dotnet-codestyle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

- name: Add local NuGet package file
continue-on-error: true
run: dotnet add package -s ../../../binding/dotnet/Cheetah/bin/Release Cheetah
run: dotnet add package -s ../../../binding/dotnet/Cheetah/bin/Release Picovoice.Cheetah
working-directory: demo/dotnet/CheetahDemo
# ********************************************************

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dotnet-demos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

- name: Add local NuGet package file
continue-on-error: true
run: dotnet add package -s ../../../binding/dotnet/Cheetah/bin/Release Cheetah
run: dotnet add package -s ../../../binding/dotnet/Cheetah/bin/Release Picovoice.Cheetah
# ********************************************************

- name: Package restore
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:

- name: Add local NuGet package file
continue-on-error: true
run: dotnet add package -s ../../../binding/dotnet/Cheetah/bin/Release Cheetah
run: dotnet add package -s ../../../binding/dotnet/Cheetah/bin/Release Picovoice.Cheetah
# ********************************************************

- name: Package restore
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/go-demos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:

# ************** REMOVE AFTER RELEASE ********************
- name: Get Go SDK from branch
run: go get github.com/Picovoice/cheetah/binding/go/v2/@e46bc0c60723c45618d3df95a38882e457788b47
run: go get github.com/Picovoice/cheetah/binding/go/v2/@637d6b54e214db36dca3527ed66843a1f6513deb
# ********************************************************

- name: Build micdemo
Expand All @@ -68,7 +68,7 @@ jobs:

# ************** REMOVE AFTER RELEASE ********************
- name: Get Go SDK from branch
run: go get github.com/Picovoice/cheetah/binding/go/v2/@e46bc0c60723c45618d3df95a38882e457788b47
run: go get github.com/Picovoice/cheetah/binding/go/v2/@637d6b54e214db36dca3527ed66843a1f6513deb
# ********************************************************

- name: Build micdemo
Expand Down
10 changes: 0 additions & 10 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,6 @@ jobs:
- name: Pre-build dependencies
run: ./copy.sh

# ************** REMOVE AFTER RELEASE ********************
- name: Get Go SDK from branch
run: go get github.com/Picovoice/cheetah/binding/go/v2/@e46bc0c60723c45618d3df95a38882e457788b47
# ********************************************************

- name: Build
run: go build

Expand All @@ -79,11 +74,6 @@ jobs:
- name: Pre-build dependencies
run: ./copy.sh

# ************** REMOVE AFTER RELEASE ********************
- name: Get Go SDK from branch
run: go get github.com/Picovoice/cheetah/binding/go/v2/@e46bc0c60723c45618d3df95a38882e457788b47
# ********************************************************

- name: Build
run: go build

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nodejs-demos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:

strategy:
matrix:
machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson]
machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64]

steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:

strategy:
matrix:
machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson]
machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64]

steps:
- uses: actions/checkout@v3
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ on:
- '!binding/python/README.md'
- 'lib/common/**'
- 'lib/linux/**'
- 'lib/jetson/**'
- 'lib/mac/**'
- 'lib/raspberry-pi/**'
- 'lib/windows/**'
Expand All @@ -22,7 +21,6 @@ on:
- '!binding/python/README.md'
- 'lib/common/**'
- 'lib/linux/**'
- 'lib/jetson/**'
- 'lib/mac/**'
- 'lib/raspberry-pi/**'
- 'lib/windows/**'
Expand Down Expand Up @@ -62,7 +60,7 @@ jobs:

strategy:
matrix:
machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson]
machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64]

steps:
- uses: actions/checkout@v3
Expand All @@ -71,4 +69,4 @@ jobs:
run: pip install -r requirements.txt

- name: Test
run: python3 test_cheetah.py ${{secrets.PV_VALID_ACCESS_KEY}}
run: python3 test_cheetah.py ${{secrets.PV_VALID_ACCESS_KEY}}
1 change: 1 addition & 0 deletions .github/workflows/rust-demos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ on:
defaults:
run:
working-directory: demo/rust
shell: bash

jobs:
build-github-hosted:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Cheetah is an on-device streaming speech-to-text engine. Cheetah is:
- Linux (x86_64), macOS (x86_64, arm64), and Windows (x86_64)
- Android and iOS
- Chrome, Safari, Firefox, and Edge
- Raspberry Pi (3, 4, 5) and NVIDIA Jetson Nano
- Raspberry Pi (3, 4, 5)

## Table of Contents

Expand Down
22 changes: 22 additions & 0 deletions binding/react-native/test-app/CheetahTestApp/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,27 @@ target 'CheetahTestApp' do
:mac_catalyst_enabled => false
)
__apply_Xcode_12_5_M1_post_install_workaround(installer)

installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)', '_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION']

if target.to_s === 'React-Codegen'
config.build_settings['SWIFT_VERSION'] = '5.0'
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
end
end

if target.name == 'Flipper'
file_path = 'Pods/Flipper/xplat/Flipper/FlipperTransportTypes.h'
contents = File.read(file_path)
unless contents.include?('#include <functional>')
File.open(file_path, 'w') do |file|
file.puts('#include <functional>')
file.puts(contents)
end
end
end
end
end
end

0 comments on commit 8b7b133

Please sign in to comment.