try fixes

Picovoice · Sep 11, 2024 · 80ac0db · 80ac0db
1 parent 4c1e074
commit 80ac0db
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 40 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -32,7 +32,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, macos-13]
+        os: [ubuntu-latest]
         dotnet-version: [2.1.x, 3.0.x, 3.1.x, 5.0.x, 6.0.x, 8.0.x]
         include:
           - dotnet-version: 2.1.x
@@ -53,19 +53,6 @@ jobs:
           - dotnet-version: 8.0.x
             binding-framework: net8.0
             test-framework: net8.0
-        exclude:
-          - os: macos-latest
-            dotnet-version: 2.1.x
-          - os: macos-latest
-            dotnet-version: 3.0.x
-          - os: macos-latest
-            dotnet-version: 3.1.x
-          - os: macos-latest
-            dotnet-version: 5.0.x
-          - os: macos-latest
-            dotnet-version: 6.0.x
-          - os: macos-13
-            dotnet-version: 8.0.x
 
     steps:
     - uses: actions/checkout@v3
@@ -86,7 +73,7 @@ jobs:
 
     strategy:
       matrix:
-        machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-32, rpi5-64, pv-windows]
+        machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-32, rpi5-64, pv-windows, pv-ios]
 
     steps:
     - uses: actions/checkout@v3

diff --git a/.github/workflows/go-demos.yml b/.github/workflows/go-demos.yml
@@ -46,7 +46,7 @@ jobs:
 
       # ************** REMOVE AFTER RELEASE ********************
     - name: Get Go SDK from branch
-      run: go get github.com/Picovoice/pvspeaker/binding/go/v3/@ac44e4f64941ef6a121d3ee2d9628d1856d800b6
+      run: go get github.com/Picovoice/pvrecorder/binding/go/v3/@ac44e4f64941ef6a121d3ee2d9628d1856d800b6
       # ********************************************************
 
 #    - name: Install dependencies
@@ -72,7 +72,7 @@ jobs:
 
       # ************** REMOVE AFTER RELEASE ********************
     - name: Get Go SDK from branch
-      run: go get github.com/Picovoice/pvspeaker/binding/go/v3/@ac44e4f64941ef6a121d3ee2d9628d1856d800b6
+      run: go get github.com/Picovoice/pvrecorder/binding/go/v3/@ac44e4f64941ef6a121d3ee2d9628d1856d800b6
       # ********************************************************
 
 #    - name: Install dependencies

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -33,20 +33,14 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest]
         go: [ '1.16', '1.17', '1.18', '1.19', '1.20', '1.21', '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
       uses: actions/setup-go@v4
       with:
@@ -69,7 +63,7 @@ jobs:
 
     strategy:
       matrix:
-        machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-32, rpi5-64, pv-windows]
+        machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-32, rpi5-64, pv-windows, pv-ios]
 
     steps:
     - uses: actions/checkout@v3
@@ -80,7 +74,7 @@ jobs:
       run: ./copy.sh
 
     - name: Install dependencies
-      run: go install
+      run: go get
 
     - name: Build
       run: go build

diff --git a/.github/workflows/nodejs-demos.yml b/.github/workflows/nodejs-demos.yml
@@ -38,9 +38,6 @@ jobs:
       with:
         node-version: ${{ matrix.node-version }}
 
-    - name: Pre-build dependencies
-      run: npm install yarn
-
       # ************** REMOVE AFTER RELEASE ********************
     - name: Build Node.js SDK
       run: yarn && yarn build
@@ -65,9 +62,6 @@ jobs:
       with:
         submodules: recursive
 
-    - name: Pre-build dependencies
-      run: npm install yarn
-
       # ************** REMOVE AFTER RELEASE ********************
     - name: Build Node.js SDK
       run: yarn && yarn build

diff --git a/.github/workflows/python-demos.yml b/.github/workflows/python-demos.yml
@@ -66,7 +66,10 @@ jobs:
       run: pip install wheel && cd ../../binding/python && python3 setup.py sdist bdist_wheel && pip install dist/pvrecorder-1.2.3-py3-none-any.whl
 
     - name: Install dependencies
-      run: pip3 install -r requirements.txt
+      run: |
+        python3 -m venv .venv
+        source .venv/bin/activate
+        pip3 install -r requirements.txt
 
     - name: Run demo
       run: python3 pv_recorder_demo.py --show_audio_devices
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -36,7 +36,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest]
 
     steps:
     - uses: actions/checkout@v3
@@ -68,7 +68,7 @@ jobs:
 
     strategy:
       matrix:
-        machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-32, rpi5-64, pv-windows]
+        machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-32, rpi5-64, pv-windows, pv-ios]
 
     steps:
     - uses: actions/checkout@v3

diff --git a/binding/nodejs/test/pv_recorder.test.ts b/binding/nodejs/test/pv_recorder.test.ts
@@ -4,23 +4,23 @@ describe("Test PvRecorder", () => {
   test("invalid device index", () => {
     const f = () => {
       new PvRecorder(512, -2);
-    }
+    };
 
     expect(f).toThrow(Error);
   });
 
   test("invalid frame length", () => {
     const f = () => {
       new PvRecorder(0, 0);
-    }
+    };
 
     expect(f).toThrow(Error);
   });
 
   test("invalid buffered frames count", () => {
     const f = () => {
       new PvRecorder(512, 0, 0);
-    }
+    };
 
     expect(f).toThrow(Error);
   });

diff --git a/binding/rust/src/util.rs b/binding/rust/src/util.rs
@@ -71,7 +71,7 @@ fn base_library_path() -> PathBuf {
 
 #[cfg(all(target_os = "linux", any(target_arch = "arm", target_arch = "aarch64")))]
 fn base_library_path() -> PathBuf {
-    const RPI_MACHINES: [&str; 5] = ["arm11", "cortex-a53", "cortex-a72", "cortex-a76"];
+    const RPI_MACHINES: [&str; 4] = ["arm11", "cortex-a53", "cortex-a72", "cortex-a76"];
 
     let machine = find_machine_type();
     match machine.as_str() {

diff --git a/demo/c/CMakeLists.txt b/demo/c/CMakeLists.txt
@@ -8,7 +8,7 @@ if(NOT PV_RECORDER_PLATFORM)
             "raspberry-pi5-64")
 endif()
 
-elseif (${PV_RECORDER_PLATFORM} STREQUAL "mac-arm64")
+if (${PV_RECORDER_PLATFORM} STREQUAL "mac-arm64")
     set(PV_RECORDER_LIB_DIR ${CMAKE_SOURCE_DIR}/../../lib/mac/arm64)
 elseif (${PV_RECORDER_PLATFORM} STREQUAL "mac-x86_64")
     set(PV_RECORDER_LIB_DIR ${CMAKE_SOURCE_DIR}/../../lib/mac/x86_64)