Go rpi5 support (#780)

Picovoice · Feb 2, 2024 · 1a770c1 · 1a770c1
1 parent adb7433
commit 1a770c1
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 43 deletions.
diff --git a/.github/workflows/go-demos.yml b/.github/workflows/go-demos.yml
@@ -20,56 +20,46 @@ defaults:
     working-directory: demo/go
 
 jobs:
-  build-micdemo:
-    runs-on: ubuntu-latest
+  build-github-hosted:
+    runs-on: ${{ matrix.os }}
 
     strategy:
       matrix:
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
         go: [ '1.16', '1.17', '1.18', '1.19', '1.20', 'stable' ]
 
     steps:
     - uses: actions/checkout@v3
-      with:
-        submodules: recursive
 
     - name: Set up Mingw
       uses: egor-tensin/setup-mingw@v2
       if: ${{ (matrix.os == 'windows-latest') && (matrix.go != 'stable') && (matrix.go < 1.20) }}
       with:
         version: 11.2.0
 
-    - name: Setup go
+    - name: Set up go
       uses: actions/setup-go@v4
       with:
         go-version: ${{ matrix.go }}
 
     - name: Build micdemo
-      run: go build
-      working-directory: demo/go/micdemo
+      run: go build micdemo/picovoice_mic_demo.go
+
+    - name: Build filedemo
+      run: go build filedemo/picovoice_file_demo.go
 
-  build-filedemo:
-    runs-on: ubuntu-latest
+  build-self-hosted:
+    runs-on: ${{ matrix.machine }}
 
     strategy:
       matrix:
-        go: [ '1.16', '1.17', '1.18', '1.19', '1.20', 'stable' ]
+        machine: [ rpi2, rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson ]
 
     steps:
     - uses: actions/checkout@v3
-      with:
-        submodules: recursive
 
-    - name: Set up Mingw
-      uses: egor-tensin/setup-mingw@v2
-      if: ${{ (matrix.os == 'windows-latest') && (matrix.go != 'stable') && (matrix.go < 1.20) }}
-      with:
-        version: 11.2.0
-
-    - name: Setup go
-      uses: actions/setup-go@v4
-      with:
-        go-version: ${{ matrix.go }}
+    - name: Build micdemo
+      run: go build micdemo/picovoice_mic_demo.go
 
     - name: Build filedemo
-      run: go build
-      working-directory: demo/go/filedemo
+      run: go build filedemo/picovoice_file_demo.go
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -67,7 +67,7 @@ jobs:
 
     strategy:
       matrix:
-        machine: [rpi2, rpi3-32, rpi3-64, rpi4-32, rpi4-64, jetson, beaglebone]
+        machine: [rpi2, rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson, beaglebone]
 
     steps:
     - uses: actions/checkout@v3

diff --git a/demo/go/go.mod b/demo/go/go.mod
@@ -3,9 +3,9 @@ module picovoicedemo
 go 1.16
 
 require (
-	github.com/Picovoice/picovoice/sdk/go/v3 v3.0.1
-	github.com/Picovoice/pvrecorder/binding/go v1.2.1
-	github.com/Picovoice/rhino/binding/go/v3 v3.0.1
+	github.com/Picovoice/picovoice/sdk/go/v3 v3.0.2
+	github.com/Picovoice/pvrecorder/binding/go v1.2.2
+	github.com/Picovoice/rhino/binding/go/v3 v3.0.2
 	github.com/go-audio/audio v1.0.0
 	github.com/go-audio/wav v1.0.0
 )
diff --git a/demo/go/go.sum b/demo/go/go.sum
@@ -1,11 +1,11 @@
-github.com/Picovoice/picovoice/sdk/go/v3 v3.0.1 h1:fb4dhkiSJ0oHO9gFo1gjJOK3e5IwnulKYsi7iq/F3OI=
-github.com/Picovoice/picovoice/sdk/go/v3 v3.0.1/go.mod h1:a87x08Q7YAC4B9XCBmaudeVHCk+uponDS0jGnS3HuQ0=
-github.com/Picovoice/porcupine/binding/go/v3 v3.0.1 h1:QGLeCljdU5ZAvbYuTD4QPk6E65TRTsS+4ixfZguUVxc=
-github.com/Picovoice/porcupine/binding/go/v3 v3.0.1/go.mod h1:6Pg/746wMh0GDNEWqi56GuTsTk7WLeVgTB0ZhyERs8U=
-github.com/Picovoice/pvrecorder/binding/go v1.2.1 h1:p99fkYMFbTS4g4WwbhSPkT9PHvlEoVYGaNoqxCITiEo=
-github.com/Picovoice/pvrecorder/binding/go v1.2.1/go.mod h1:gQdvBAjoKmRxMFh8W9cVKWcqHsWvu+d13sCPVFm7dhg=
-github.com/Picovoice/rhino/binding/go/v3 v3.0.1 h1:QHoEsIXxJOHFtboUKvLa2DVgsyLsUeO7knZGFgh6Dbo=
-github.com/Picovoice/rhino/binding/go/v3 v3.0.1/go.mod h1:CKikI/Tv7hIyj0aOnAKaBIGPzWfx/0SUayYFDnPCmmI=
+github.com/Picovoice/picovoice/sdk/go/v3 v3.0.2 h1:pyAfHvqPNJvj6d6sqv2qnSe5yxtkOp0ml3VIuGr/zjM=
+github.com/Picovoice/picovoice/sdk/go/v3 v3.0.2/go.mod h1:eZULulF8trfROGO3nnWapKyIfwXhn86LMYG1hWpEIlY=
+github.com/Picovoice/porcupine/binding/go/v3 v3.0.2 h1:mgvA50lIybYhfCMCwXoPvqjuyAKBppT8ZGSn/7F4ank=
+github.com/Picovoice/porcupine/binding/go/v3 v3.0.2/go.mod h1:6Pg/746wMh0GDNEWqi56GuTsTk7WLeVgTB0ZhyERs8U=
+github.com/Picovoice/pvrecorder/binding/go v1.2.2 h1:UN0u60hVR+s8kYmVSITS4UbTihHzeNxlNkJKYoKaVbo=
+github.com/Picovoice/pvrecorder/binding/go v1.2.2/go.mod h1:gQdvBAjoKmRxMFh8W9cVKWcqHsWvu+d13sCPVFm7dhg=
+github.com/Picovoice/rhino/binding/go/v3 v3.0.2 h1:z3YSRDc2zGJNWkOsqo7aEdW039+VmrqZ8axZ4uOWQDA=
+github.com/Picovoice/rhino/binding/go/v3 v3.0.2/go.mod h1:CKikI/Tv7hIyj0aOnAKaBIGPzWfx/0SUayYFDnPCmmI=
 github.com/go-audio/audio v1.0.0 h1:zS9vebldgbQqktK4H0lUqWrG8P0NxCJVqcj7ZpNnwd4=
 github.com/go-audio/audio v1.0.0/go.mod h1:6uAu0+H2lHkwdGsAY+j2wHPNPpPoeg5AaEFh9FlA+Zs=
 github.com/go-audio/riff v1.0.0 h1:d8iCGbDvox9BfLagY94fBynxSPHO80LmZCaOsmKxokA=

diff --git a/sdk/go/go.mod b/sdk/go/go.mod
@@ -3,6 +3,6 @@ module github.com/Picovoice/picovoice/sdk/go/v3
 go 1.16
 
 require (
-	github.com/Picovoice/porcupine/binding/go/v3 v3.0.1
-	github.com/Picovoice/rhino/binding/go/v3 v3.0.1
+	github.com/Picovoice/porcupine/binding/go/v3 v3.0.2
+	github.com/Picovoice/rhino/binding/go/v3 v3.0.2
 )
diff --git a/sdk/go/go.sum b/sdk/go/go.sum
@@ -1,4 +1,4 @@
-github.com/Picovoice/porcupine/binding/go/v3 v3.0.1 h1:QGLeCljdU5ZAvbYuTD4QPk6E65TRTsS+4ixfZguUVxc=
-github.com/Picovoice/porcupine/binding/go/v3 v3.0.1/go.mod h1:6Pg/746wMh0GDNEWqi56GuTsTk7WLeVgTB0ZhyERs8U=
-github.com/Picovoice/rhino/binding/go/v3 v3.0.1 h1:QHoEsIXxJOHFtboUKvLa2DVgsyLsUeO7knZGFgh6Dbo=
-github.com/Picovoice/rhino/binding/go/v3 v3.0.1/go.mod h1:CKikI/Tv7hIyj0aOnAKaBIGPzWfx/0SUayYFDnPCmmI=
+github.com/Picovoice/porcupine/binding/go/v3 v3.0.2 h1:mgvA50lIybYhfCMCwXoPvqjuyAKBppT8ZGSn/7F4ank=
+github.com/Picovoice/porcupine/binding/go/v3 v3.0.2/go.mod h1:6Pg/746wMh0GDNEWqi56GuTsTk7WLeVgTB0ZhyERs8U=
+github.com/Picovoice/rhino/binding/go/v3 v3.0.2 h1:z3YSRDc2zGJNWkOsqo7aEdW039+VmrqZ8axZ4uOWQDA=
+github.com/Picovoice/rhino/binding/go/v3 v3.0.2/go.mod h1:CKikI/Tv7hIyj0aOnAKaBIGPzWfx/0SUayYFDnPCmmI=
diff --git a/sdk/go/picovoice_test.go b/sdk/go/picovoice_test.go
@@ -302,7 +302,7 @@ func getLinuxDetails() string {
 	}
 
 	switch cpuPart {
-	case "0xb76", "0xc07", "0xd03", "0xd08":
+	case "0xb76", "0xc07", "0xd03", "0xd08", "0xd0b":
 		return "raspberry-pi"
 	case "0xd07":
 		return "jetson"