diff --git a/.github/workflows/dotnet-demos.yml b/.github/workflows/dotnet-demos.yml index 26f904f14d..1fd057ac6f 100644 --- a/.github/workflows/dotnet-demos.yml +++ b/.github/workflows/dotnet-demos.yml @@ -71,6 +71,16 @@ jobs: steps: - uses: actions/checkout@v3 + # ************** REMOVE AFTER RELEASE ******************** + - name: Pack .NET SDK + run: dotnet pack -c Release + working-directory: binding/dotnet + + - name: Add local NuGet package file + continue-on-error: true + run: dotnet add package -s ../../../binding/dotnet/Porcupine/bin/Release Porcupine + # ******************************************************** + - name: Package restore run: dotnet restore diff --git a/.github/workflows/go-demos.yml b/.github/workflows/go-demos.yml index 03aa0eea02..de1188d575 100644 --- a/.github/workflows/go-demos.yml +++ b/.github/workflows/go-demos.yml @@ -45,7 +45,7 @@ jobs: # ************** REMOVE AFTER RELEASE ******************** - name: Install Go SDK from branch - run: go install github.com/Picovoice/porcupine/binding/go/v3/@d7a0b3ff1b171cd4e1f84bc2da10dc7fa88a8dbe + run: go get github.com/Picovoice/porcupine/binding/go/v3/@d7a0b3ff1b171cd4e1f84bc2da10dc7fa88a8dbe # ******************************************************** - name: Build micdemo @@ -69,7 +69,7 @@ jobs: # ************** REMOVE AFTER RELEASE ******************** - name: Install Go SDK from branch - run: go install github.com/Picovoice/porcupine/binding/go/v3/@d7a0b3ff1b171cd4e1f84bc2da10dc7fa88a8dbe + run: go get github.com/Picovoice/porcupine/binding/go/v3/@d7a0b3ff1b171cd4e1f84bc2da10dc7fa88a8dbe # ******************************************************** - name: Build micdemo diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 9f12a72f86..743863aea1 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -48,14 +48,14 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest, macos-latest] - go: [ '1.16', '1.17', '1.18', '1.19', '1.20', 'stable' ] + go: [ '1.16', '1.17', '1.18', '1.19', '1.20' ] steps: - uses: actions/checkout@v3 - name: Set up Mingw uses: egor-tensin/setup-mingw@v2 - if: ${{ (matrix.os == 'windows-latest') && (matrix.go != 'stable') && (matrix.go < 1.20) }} + if: ${{ (matrix.os == 'windows-latest') && (matrix.go < 1.20) }} with: version: 11.2.0 diff --git a/.github/workflows/rust-demos.yml b/.github/workflows/rust-demos.yml index 6b55c226d0..2d23fe9e5c 100644 --- a/.github/workflows/rust-demos.yml +++ b/.github/workflows/rust-demos.yml @@ -21,6 +21,7 @@ env: defaults: run: working-directory: demo/rust + shell: bash jobs: build-github-hosted: diff --git a/binding/go/porcupine.go b/binding/go/porcupine.go index 164afa10d4..9bb85c0d9b 100644 --- a/binding/go/porcupine.go +++ b/binding/go/porcupine.go @@ -218,7 +218,7 @@ func (porcupine *Porcupine) Init() error { Message: fmt.Sprintf("Specified model file could not be found at %s", porcupine.ModelPath)} } - if porcupine.BuiltInKeywords != nil && len(porcupine.BuiltInKeywords) > 0 { + if len(porcupine.BuiltInKeywords) > 0 { for _, keyword := range porcupine.BuiltInKeywords { if !keyword.IsValid() { return &PorcupineError{ @@ -230,7 +230,7 @@ func (porcupine *Porcupine) Init() error { } } - if porcupine.KeywordPaths == nil || len(porcupine.KeywordPaths) == 0 { + if len(porcupine.KeywordPaths) == 0 { return &PorcupineError{ StatusCode: INVALID_ARGUMENT, Message: "No valid keywords were provided"} diff --git a/demo/c/CMakeLists.txt b/demo/c/CMakeLists.txt index 538bfaa73c..2ecb505d1c 100644 --- a/demo/c/CMakeLists.txt +++ b/demo/c/CMakeLists.txt @@ -24,7 +24,7 @@ target_include_directories(porcupine_demo_file PRIVATE dr_libs) if (NOT WIN32) target_link_libraries(porcupine_demo_mic ${COMMON_LIBS} ${MIC_LIBS}) target_link_libraries(porcupine_demo_file ${COMMON_LIBS}) - if((${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm") AND (UNIX AND NOT APPLE)) + if((${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64") AND (UNIX AND NOT APPLE)) target_link_libraries(porcupine_demo_mic atomic) endif() endif() diff --git a/demo/unity/images/image_attribution.md b/demo/unity/images/image_attribution.md index d250c2d7c4..4cad0d5536 100644 --- a/demo/unity/images/image_attribution.md +++ b/demo/unity/images/image_attribution.md @@ -1 +1 @@ -Icons made by [Freepik](https://www.freepik.com) from [Flaticon](https://www.flaticon.com/) \ No newline at end of file +Icons made by [Freepik](https://www.freepik.com) from [Flaticon](https://www.flaticon.com/) diff --git a/resources/.lint/spell-check/dict.txt b/resources/.lint/spell-check/dict.txt index 384d18f701..ea2841c205 100644 --- a/resources/.lint/spell-check/dict.txt +++ b/resources/.lint/spell-check/dict.txt @@ -13,6 +13,7 @@ armv atclause avalonia avares +beaglebone behaviour bigseubi bushi @@ -82,6 +83,7 @@ itertools jarvis javadoc javax +jetson keompyuteo konnichiwa konpyūtā