diff --git a/.github/workflows/c-demos.yml b/.github/workflows/c-demos.yml index eab4577f..d0f117fe 100644 --- a/.github/workflows/c-demos.yml +++ b/.github/workflows/c-demos.yml @@ -143,11 +143,10 @@ jobs: - machine: rpi5-64 platform: raspberry-pi arch: cortex-a76-aarch64 - include: - - machine: pv-windows-arm64 - platform: windows - arch: arm64 - make_file: "MinGW Makefiles" + - machine: pv-windows-arm64 + platform: windows + arch: arm64 + make_file: "MinGW Makefiles" steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/dotnet-demos.yml b/.github/workflows/dotnet-demos.yml index f6786950..4d93725a 100644 --- a/.github/workflows/dotnet-demos.yml +++ b/.github/workflows/dotnet-demos.yml @@ -71,6 +71,8 @@ jobs: platform: raspberry-pi - machine: rpi5-64 platform: raspberry-pi + - machine: pv-windows-arm64 + platform: windows steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/nodejs-demos.yml b/.github/workflows/nodejs-demos.yml index f47f426b..841fdafa 100644 --- a/.github/workflows/nodejs-demos.yml +++ b/.github/workflows/nodejs-demos.yml @@ -77,6 +77,8 @@ jobs: platform: raspberry-pi - machine: rpi5-64 platform: raspberry-pi + - machine: pv-windows-arm64 + platform: windows steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/python-demos.yml b/.github/workflows/python-demos.yml index bce89c19..6e5632df 100644 --- a/.github/workflows/python-demos.yml +++ b/.github/workflows/python-demos.yml @@ -46,6 +46,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 @@ -75,9 +83,6 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Install dependencies - run: pip3 install -r requirements.txt - # ************ REMOVE AFTER RELEASE *************** - name: build local binding run: | @@ -86,5 +91,8 @@ jobs: working-directory: binding/python # ************ REMOVE AFTER RELEASE *************** + - name: Install dependencies + run: pip3 install -r requirements.txt + - name: Test run: python3 rhino_demo_file.py --access_key ${{secrets.PV_VALID_ACCESS_KEY}} --wav_path ../../resources/audio_samples/test_within_context.wav --context_path ../../resources/contexts/${{ matrix.platform }}/coffee_maker_${{ matrix.platform }}.rhn diff --git a/binding/java/build.gradle b/binding/java/build.gradle index c48cc298..ac15e3e6 100644 --- a/binding/java/build.gradle +++ b/binding/java/build.gradle @@ -53,7 +53,7 @@ task copyWindowsLib(type: Copy) { from('../../lib/java/windows/') include('amd64/pv_rhino_jni.dll', 'arm64/pv_rhino_jni.dll') - into "${outputDir}/rhino/lib/java/windows/amd64/" + into "${outputDir}/rhino/lib/java/windows/" } task copyRPiLib(type: Copy) { from('../../lib/java/raspberry-pi/')