Skip to content

Commit

Permalink
basic fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
albho committed Aug 15, 2024
1 parent 8368f15 commit a51f514
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 8 deletions.
10 changes: 10 additions & 0 deletions .github/workflows/dotnet-demos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

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 @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/rust-demos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ env:
defaults:
run:
working-directory: demo/rust
shell: bash

jobs:
build-github-hosted:
Expand Down
4 changes: 2 additions & 2 deletions binding/go/porcupine.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand All @@ -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"}
Expand Down
2 changes: 1 addition & 1 deletion demo/c/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
2 changes: 1 addition & 1 deletion demo/unity/images/image_attribution.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Icons made by [Freepik](https://www.freepik.com) from [Flaticon](https://www.flaticon.com/)
Icons made by [Freepik](https://www.freepik.com) from [Flaticon](https://www.flaticon.com/)<!-- markdown-link-check-disable-line -->
2 changes: 2 additions & 0 deletions resources/.lint/spell-check/dict.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ armv
atclause
avalonia
avares
beaglebone
behaviour
bigseubi
bushi
Expand Down Expand Up @@ -82,6 +83,7 @@ itertools
jarvis
javadoc
javax
jetson
keompyuteo
konnichiwa
konpyūtā
Expand Down

0 comments on commit a51f514

Please sign in to comment.