Merge pull request #120 from Picovoice/better-platform-detection

Picovoice · Jan 15, 2025 · 6cc52b3 · 6cc52b3
2 parents 9c99557 + 95b3b4e
commit 6cc52b3
Show file tree

Hide file tree

Showing 52 changed files with 669 additions and 304 deletions.
diff --git a/.github/workflows/c-demo.yml b/.github/workflows/c-demo.yml
@@ -31,7 +31,7 @@ jobs:
           - os: ubuntu-latest
             pv_recorder_platform: linux
           - os: windows-latest
-            pv_recorder_platform: windows
+            pv_recorder_platform: windows-amd64
           - os: macos-latest
             pv_recorder_platform: mac-arm64
 
@@ -53,7 +53,7 @@ jobs:
     runs-on: ${{ matrix.machine }}
     strategy:
       matrix:
-        machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-32, rpi5-64]
+        machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-32, rpi5-64, pv-windows-arm64]
         include:
           - machine: rpi3-32
             pv_recorder_platform: raspberry-pi3
@@ -67,6 +67,9 @@ jobs:
             pv_recorder_platform: raspberry-pi5
           - machine: rpi5-64
             pv_recorder_platform: raspberry-pi5-64
+          - machine: pv-windows-arm64
+            pv_recorder_platform: windows-arm64
+            shell: pwsh
 
     steps:
       - uses: actions/checkout@v3

diff --git a/.github/workflows/dotnet-demo.yml b/.github/workflows/dotnet-demo.yml
@@ -53,7 +53,10 @@ jobs:
 
     strategy:
       matrix:
-        machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-32, rpi5-64]
+        machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-32, pv-windows-arm64]
+        include:
+          - machine: pv-windows-arm64
+            shell: pwsh
 
     steps:
     - uses: actions/checkout@v3

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -31,22 +31,11 @@ jobs:
   build-github-hosted:
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        dotnet-version: [2.1.x, 3.0.x, 3.1.x, 5.0.x, 6.0.x, 8.0.x]
+        dotnet-version: [6.0.x, 8.0.x]
         include:
-          - dotnet-version: 2.1.x
-            binding-framework: netstandard2.0
-            test-framework: netcoreapp2.1.30
-          - dotnet-version: 3.0.x
-            binding-framework: netcoreapp3.0
-            test-framework: netcoreapp3.0
-          - dotnet-version: 3.1.x
-            binding-framework: netcoreapp3.0
-            test-framework: netcoreapp3.1
-          - dotnet-version: 5.0.x
-            binding-framework: netcoreapp3.0
-            test-framework: net5.0
           - dotnet-version: 6.0.x
             binding-framework: net6.0
             test-framework: net6.0
@@ -55,13 +44,19 @@ jobs:
             test-framework: net8.0
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: ${{ matrix.dotnet-version }}
 
+    - name: Set up .NET (8)
+      if: ${{ matrix.os == 'ubuntu-latest' && matrix.dotnet-version == '6.0.x' }}
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 8.0.x
+
     - name: Build binding
       run: dotnet build PvRecorder/PvRecorder.csproj --framework ${{ matrix.binding-framework }}
 
@@ -72,14 +67,39 @@ jobs:
     runs-on: ${{ matrix.machine }}
 
     strategy:
+      fail-fast: false
       matrix:
-        machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-32, rpi5-64, pv-windows, pv-ios]
+        machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-32, rpi5-64, pv-windows, pv-ios, pv-windows-arm64]
+        dotnet-version: [6.0.x, 8.0.x]
+        include:
+          - dotnet-version: 6.0.x
+            binding-framework: net6.0
+            test-framework: net6.0
+          - dotnet-version: 8.0.x
+            binding-framework: net8.0
+            test-framework: net8.0
+          - machine: pv-windows
+            dotnet-version: 2.1.x
+            binding-framework: netstandard2.0
+            test-framework: netcoreapp2.1
+          - machine: pv-windows
+            dotnet-version: 3.0.x
+            binding-framework: netcoreapp3.0
+            test-framework: netcoreapp3.0
+          - machine: pv-windows
+            dotnet-version: 3.1.x
+            binding-framework: netcoreapp3.0
+            test-framework: netcoreapp3.1
+          - machine: pv-windows
+            dotnet-version: 5.0.x
+            binding-framework: netcoreapp3.0
+            test-framework: net5.0
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Build binding
-      run: dotnet build PvRecorder/PvRecorder.csproj --framework net8.0
+      run: dotnet build PvRecorder/PvRecorder.csproj --framework ${{ matrix.binding-framework }}
 
     - name: Test
-      run: dotnet test --framework net8.0 -v n
+      run: dotnet test --framework ${{ matrix.test-framework }} -v n
diff --git a/.github/workflows/go-demos.yml b/.github/workflows/go-demos.yml
@@ -58,7 +58,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-windows-arm64]
 
     steps:
     - uses: actions/checkout@v3

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -63,7 +63,7 @@ jobs:
 
     strategy:
       matrix:
-        machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-32, rpi5-64, pv-windows, pv-ios]
+        machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-32, rpi5-64, pv-windows, pv-windows-arm64, pv-ios]
 
     steps:
     - uses: actions/checkout@v3

diff --git a/.github/workflows/nodejs-codestyle.yml b/.github/workflows/nodejs-codestyle.yml
@@ -27,9 +27,6 @@ jobs:
       with:
         node-version: lts/*
 
-    - name: Pre-build dependencies
-      run: npm install yarn
-
     - name: Run Binding Linter
       run: yarn && yarn lint
-      working-directory: binding/nodejs
+      working-directory: binding/nodejs
diff --git a/.github/workflows/nodejs-demos.yml b/.github/workflows/nodejs-demos.yml
@@ -38,6 +38,14 @@ jobs:
       with:
         node-version: ${{ matrix.node-version }}
 
+    # ************ REMOVE AFTER RELEASE ***************
+    - name: build local binding
+      run: |
+        yarn install
+        yarn build
+      working-directory: binding/nodejs
+    # ************ REMOVE AFTER RELEASE ***************
+
     - name: Install dependencies
       run: yarn install
 
@@ -49,13 +57,21 @@ jobs:
 
     strategy:
       matrix:
-        machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-32, rpi5-64, pv-windows, pv-ios]
+        machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-32, rpi5-64, pv-ios, pv-windows, pv-windows-arm64]
 
     steps:
     - uses: actions/checkout@v3
       with:
         submodules: recursive
 
+    # ************ REMOVE AFTER RELEASE ***************
+    - name: build local binding
+      run: |
+        yarn install
+        yarn build
+      working-directory: binding/nodejs
+    # ************ REMOVE AFTER RELEASE ***************
+
     - name: Install dependencies
       run: yarn install
 

diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -40,9 +40,6 @@ jobs:
       with:
         node-version: ${{ matrix.node-version }}
 
-    - name: Pre-build dependencies
-      run: npm install yarn
-
     - name: Install dependencies
       run: yarn install
 
@@ -60,7 +57,7 @@ jobs:
 
     strategy:
       matrix:
-        machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-32, rpi5-64, pv-windows, pv-ios]
+        machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-32, rpi5-64, pv-windows, pv-windows-arm64, pv-ios]
 
     steps:
     - uses: actions/checkout@v3

diff --git a/.github/workflows/python-demos.yml b/.github/workflows/python-demos.yml
@@ -39,6 +39,14 @@ jobs:
     - name: Pre-build dependencies
       run: python -m pip install --upgrade pip
 
+    # ************ REMOVE AFTER RELEASE ***************
+    - name: build local binding
+      run: |
+        python3 -m pip install setuptools wheel
+        python3 -m setup sdist bdist_wheel
+      working-directory: binding/python
+    # ************ REMOVE AFTER RELEASE ***************
+
     - name: Install dependencies
       run: pip install -r requirements.txt
 
@@ -55,6 +63,13 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
+    # ************ REMOVE AFTER RELEASE ***************
+    - name: build local binding
+      run: |
+        python3 -m setup sdist bdist_wheel
+      working-directory: binding/python
+    # ************ REMOVE AFTER RELEASE ***************
+
     - name: Install dependencies
       run: |
         python3 -m venv .venv
@@ -66,3 +81,27 @@ jobs:
         python3 -m venv .venv
         source .venv/bin/activate
         python3 pv_recorder_demo.py --show_audio_devices
+
+  build-windows-arm64:
+    runs-on: ${{ matrix.machine }}
+
+    strategy:
+      matrix:
+        machine: [pv-windows-arm64]
+
+    steps:
+    - uses: actions/checkout@v3
+
+    # ************ REMOVE AFTER RELEASE ***************
+    - name: build local binding
+      run: |
+        python3 -m pip install setuptools wheel
+        python3 -m setup sdist bdist_wheel
+      working-directory: binding/python
+    # ************ REMOVE AFTER RELEASE ***************
+
+    - name: Install dependencies
+      run: pip3 install -r requirements.txt
+
+    - name: Run demo
+      run: python3 pv_recorder_demo.py --show_audio_devices
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -54,7 +54,7 @@ jobs:
 
     strategy:
       matrix:
-        machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-32, rpi5-64, pv-windows, pv-ios]
+        machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-32, rpi5-64, pv-windows, pv-windows-arm64, pv-ios]
 
     steps:
     - uses: actions/checkout@v3

diff --git a/.github/workflows/rust-codestyle.yml b/.github/workflows/rust-codestyle.yml
@@ -43,11 +43,7 @@ jobs:
       working-directory: binding/rust
 
     - name: Install stable toolchain
-      uses: actions-rs/toolchain@v1
-      with:
-        profile: minimal
-        toolchain: stable
-        override: true
+      uses: dtolnay/rust-toolchain@stable
 
     - name: Run clippy
       run: cargo clippy -- -D warnings
@@ -69,11 +65,7 @@ jobs:
       working-directory: binding/rust
 
     - name: Install stable toolchain
-      uses: actions-rs/toolchain@v1
-      with:
-        profile: minimal
-        toolchain: stable
-        override: true
+      uses: dtolnay/rust-toolchain@stable
 
     - name: Run clippy
       run: cargo clippy -- -D warnings
diff --git a/.github/workflows/rust-demos.yml b/.github/workflows/rust-demos.yml
@@ -43,11 +43,7 @@ jobs:
       working-directory: binding/rust
 
     - name: Install stable toolchain
-      uses: actions-rs/toolchain@v1
-      with:
-        profile: minimal
-        toolchain: stable
-        override: true
+      uses: dtolnay/rust-toolchain@stable
 
     - name: Rust build demo
       run: cargo build --verbose
@@ -60,7 +56,7 @@ jobs:
 
     strategy:
       matrix:
-        machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-32, rpi5-64]
+        machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-32, rpi5-64, pv-windows-arm64]
 
     steps:
     - uses: actions/checkout@v3
@@ -69,12 +65,6 @@ jobs:
       run: bash copy.sh
       working-directory: binding/rust
 
-    - name: Install stable toolchain
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: stable
-        override: true
-
     - name: Rust build demo
       run: cargo build --verbose
 

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -50,13 +50,6 @@ jobs:
     - name: Rust pre-build
       run: bash copy.sh
 
-    - name: Install stable toolchain
-      uses: actions-rs/toolchain@v1
-      with:
-        profile: minimal
-        toolchain: stable
-        override: true
-
     - name: Build
       run: cargo build --verbose
 
@@ -68,30 +61,24 @@ jobs:
 
     strategy:
       matrix:
-        machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-32, rpi5-64, pv-windows, pv-ios]
+        machine: [rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-32, rpi5-64, pv-windows, pv-windows-arm64, pv-ios]
 
     steps:
     - uses: actions/checkout@v3
       with:
         submodules: recursive
 
     - name: Rust pre-build
-      if: matrix.machine != 'pv-windows'
+      if: matrix.machine != 'pv-windows' && matrix.machine != 'pv-windows-arm64'
       run: bash copy.sh
 
     - name: Rust pre-build windows
-      if: matrix.machine == 'pv-windows'
+      if: matrix.machine == 'pv-windows' || matrix.machine == 'pv-windows-arm64'
       run: |
         New-Item -Path "." -Name "data" -ItemType "directory"
         New-Item -Path ".\data" -Name "lib" -ItemType "directory"
         Copy-Item -Path "..\..\lib\windows" -Destination ".\data\lib" -Recurse
 
-    - name: Install stable toolchain
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: stable
-        override: true
-
     - name: Build
       run: cargo build --verbose