From f4085dd40485e29fdca8f6c53813292e764946fd Mon Sep 17 00:00:00 2001 From: Albert Ho Date: Thu, 15 Aug 2024 13:33:36 -0700 Subject: [PATCH] post-release --- .github/workflows/dotnet-codestyle.yml | 11 ----------- .github/workflows/dotnet-demos.yml | 20 -------------------- .github/workflows/go-demos.yml | 10 ---------- .github/workflows/nodejs-demos.yml | 12 ------------ .github/workflows/python-demos.yml | 10 ---------- .github/workflows/rust-codestyle.yml | 12 ------------ .github/workflows/rust-demos.yml | 12 ------------ demo/go/go.mod | 2 +- demo/java/build.gradle | 3 --- demo/nodejs/package.json | 2 +- demo/nodejs/yarn.lock | 4 +++- demo/python/setup.py | 2 +- demo/rust/filedemo/Cargo.lock | 2 ++ demo/rust/filedemo/Cargo.toml | 2 +- demo/rust/micdemo/Cargo.lock | 2 ++ demo/rust/micdemo/Cargo.toml | 2 +- 16 files changed, 12 insertions(+), 96 deletions(-) diff --git a/.github/workflows/dotnet-codestyle.yml b/.github/workflows/dotnet-codestyle.yml index 110729c5c..d5b11d165 100644 --- a/.github/workflows/dotnet-codestyle.yml +++ b/.github/workflows/dotnet-codestyle.yml @@ -31,17 +31,6 @@ jobs: run: dotnet format --verify-no-changes working-directory: binding/dotnet - # ************** 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/Rhino/bin/Release Rhino - working-directory: demo/dotnet/RhinoDemo - # ******************************************************** - - name: Run Demo Codestyle run: dotnet format --verify-no-changes working-directory: demo/dotnet diff --git a/.github/workflows/dotnet-demos.yml b/.github/workflows/dotnet-demos.yml index 741652745..195658df7 100644 --- a/.github/workflows/dotnet-demos.yml +++ b/.github/workflows/dotnet-demos.yml @@ -42,16 +42,6 @@ jobs: with: dotnet-version: 6.0.x - # ************** 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/Rhino/bin/Release Rhino - # ******************************************************** - - name: Package restore run: dotnet restore @@ -85,16 +75,6 @@ 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/Rhino/bin/Release Rhino - # ******************************************************** - - name: Package restore run: dotnet restore diff --git a/.github/workflows/go-demos.yml b/.github/workflows/go-demos.yml index 5a46cf5fe..85244f786 100644 --- a/.github/workflows/go-demos.yml +++ b/.github/workflows/go-demos.yml @@ -50,11 +50,6 @@ jobs: with: go-version: ${{ matrix.go }} - # ************** REMOVE AFTER RELEASE ******************** - - name: Get Go SDK from branch - run: go get github.com/Picovoice/rhino/binding/go/v3/@f2d0f832413ec4000425e23871743890085d3650 - # ******************************************************** - - name: Build micdemo run: go build micdemo/rhino_mic_demo.go @@ -85,11 +80,6 @@ jobs: steps: - uses: actions/checkout@v3 - # ************** REMOVE AFTER RELEASE ******************** - - name: Get Go SDK from branch - run: go get github.com/Picovoice/rhino/binding/go/v3/@f2d0f832413ec4000425e23871743890085d3650 - # ******************************************************** - - name: Build micdemo run: go build micdemo/rhino_mic_demo.go diff --git a/.github/workflows/nodejs-demos.yml b/.github/workflows/nodejs-demos.yml index b3cbd150a..243e4b2dc 100644 --- a/.github/workflows/nodejs-demos.yml +++ b/.github/workflows/nodejs-demos.yml @@ -46,12 +46,6 @@ jobs: with: node-version: ${{ matrix.node-version }} - # ************** REMOVE AFTER RELEASE ******************** - - name: Build Node.js SDK - run: yarn && yarn build - working-directory: binding/nodejs - # ******************************************************** - - name: Install dependencies run: yarn install @@ -79,12 +73,6 @@ jobs: steps: - uses: actions/checkout@v3 - # ************** REMOVE AFTER RELEASE ******************** - - name: Build Node.js SDK - run: yarn && yarn build - working-directory: binding/nodejs - # ******************************************************** - - name: Install dependencies run: yarn install diff --git a/.github/workflows/python-demos.yml b/.github/workflows/python-demos.yml index d0009d584..781bf10dc 100644 --- a/.github/workflows/python-demos.yml +++ b/.github/workflows/python-demos.yml @@ -46,12 +46,6 @@ jobs: - name: Pre-build dependencies run: python -m pip install --upgrade pip - # TODO: remove after release - - name: Build dependencies - run: | - python -m pip install -U pip setuptools - pip install wheel && cd ../../binding/python && python3 setup.py sdist bdist_wheel && pip install dist/pvrhino-3.0.3-py3-none-any.whl - - name: Install dependencies run: pip install -r requirements.txt @@ -79,10 +73,6 @@ jobs: steps: - uses: actions/checkout@v3 - # TODO: remove after release - - name: Build dependencies - run: pip install wheel && cd ../../binding/python && python3 setup.py sdist bdist_wheel && pip install dist/pvrhino-3.0.3-py3-none-any.whl - - name: Install dependencies run: pip3 install -r requirements.txt diff --git a/.github/workflows/rust-codestyle.yml b/.github/workflows/rust-codestyle.yml index fe68f5940..a9c22ec25 100644 --- a/.github/workflows/rust-codestyle.yml +++ b/.github/workflows/rust-codestyle.yml @@ -69,12 +69,6 @@ jobs: toolchain: stable override: true - # ************** REMOVE AFTER RELEASE ******************** - - name: Build Rust SDK - run: ./copy.sh - working-directory: binding/rust - # ******************************************************** - - name: Run clippy run: cargo clippy -- -D warnings working-directory: demo/rust/filedemo @@ -96,12 +90,6 @@ jobs: toolchain: stable override: true - # ************** REMOVE AFTER RELEASE ******************** - - name: Build Rust SDK - run: ./copy.sh - working-directory: binding/rust - # ******************************************************** - - name: Run clippy run: cargo clippy -- -D warnings working-directory: demo/rust/micdemo diff --git a/.github/workflows/rust-demos.yml b/.github/workflows/rust-demos.yml index 103340f89..a16059799 100644 --- a/.github/workflows/rust-demos.yml +++ b/.github/workflows/rust-demos.yml @@ -52,12 +52,6 @@ jobs: toolchain: stable override: true - # ************** REMOVE AFTER RELEASE ******************** - - name: Build Rust SDK - run: ./copy.sh - working-directory: binding/rust - # ******************************************************** - - name: Rust build micdemo run: cargo build --verbose working-directory: demo/rust/micdemo @@ -97,12 +91,6 @@ jobs: toolchain: nightly override: true - # ************** REMOVE AFTER RELEASE ******************** - - name: Build Rust SDK - run: ./copy.sh - working-directory: binding/rust - # ******************************************************** - - name: Rust build micdemo run: cargo build --verbose working-directory: demo/rust/micdemo diff --git a/demo/go/go.mod b/demo/go/go.mod index 247e6bd78..a5a7babbd 100644 --- a/demo/go/go.mod +++ b/demo/go/go.mod @@ -4,7 +4,7 @@ go 1.16 require ( github.com/Picovoice/pvrecorder/binding/go v1.2.2 - github.com/Picovoice/rhino/binding/go/v3 v3.0.2 + github.com/Picovoice/rhino/binding/go/v3 v3.0.3 github.com/go-audio/audio v1.0.0 github.com/go-audio/wav v1.0.0 ) diff --git a/demo/java/build.gradle b/demo/java/build.gradle index 0cd02496a..4e8f59ed1 100644 --- a/demo/java/build.gradle +++ b/demo/java/build.gradle @@ -4,9 +4,6 @@ plugins { repositories { mavenCentral() - maven { - url 'https://s01.oss.sonatype.org/content/repositories/aipicovoice-1332/' - } } sourceSets { diff --git a/demo/nodejs/package.json b/demo/nodejs/package.json index c21db7592..4f175ae30 100644 --- a/demo/nodejs/package.json +++ b/demo/nodejs/package.json @@ -17,7 +17,7 @@ "license": "Apache-2.0", "dependencies": { "@picovoice/pvrecorder-node": "~1.2.2", - "@picovoice/rhino-node": "file:../../binding/nodejs", + "@picovoice/rhino-node": "~3.0.5", "commander": "^6.1.0", "wavefile": "^11.0.0" }, diff --git a/demo/nodejs/yarn.lock b/demo/nodejs/yarn.lock index b7dccc39e..3d22b70fa 100644 --- a/demo/nodejs/yarn.lock +++ b/demo/nodejs/yarn.lock @@ -7,8 +7,10 @@ resolved "https://registry.yarnpkg.com/@picovoice/pvrecorder-node/-/pvrecorder-node-1.2.2.tgz#41c39719b408e29c581b3094a9ff4c59f282b026" integrity sha512-GuzZhWslbR4TLE3VxTiqjax8Mc8f1nB69bY5jag4ETlCxo7q/KpeUbWRvojhtNVPvpFLbospZAb6vfgxkEqgJQ== -"@picovoice/rhino-node@file:../../binding/nodejs": +"@picovoice/rhino-node@~3.0.5": version "3.0.5" + resolved "https://registry.yarnpkg.com/@picovoice/rhino-node/-/rhino-node-3.0.5.tgz#8ca5990e25c0231faca69dae74fad1691be55894" + integrity sha512-21/j50w5qtFw2IaaN1RawPwR66uGhGg29U7JZBDjdorcSUbPwlpR09B9pxvBTZP51EC40d8MIsQswp7jLH2vTA== commander@^6.1.0: version "6.2.1" diff --git a/demo/python/setup.py b/demo/python/setup.py index 6360844ec..1de04b7df 100644 --- a/demo/python/setup.py +++ b/demo/python/setup.py @@ -36,7 +36,7 @@ long_description_content_type="text/markdown", url="https://github.com/Picovoice/rhino", packages=["pvrhinodemo"], - install_requires=["pvrhino==3.0.2", "pvrecorder==1.2.2"], + install_requires=["pvrhino==3.0.3", "pvrecorder==1.2.2"], include_package_data=True, classifiers=[ "Development Status :: 5 - Production/Stable", diff --git a/demo/rust/filedemo/Cargo.lock b/demo/rust/filedemo/Cargo.lock index 4eda5c9cb..5f6ad1468 100644 --- a/demo/rust/filedemo/Cargo.lock +++ b/demo/rust/filedemo/Cargo.lock @@ -307,6 +307,8 @@ dependencies = [ [[package]] name = "pv_rhino" version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56cba466f05dbc2c5a69cc21904fc3acb9ea4235a0e432b4a68c155c963534c0" dependencies = [ "libc", "libloading", diff --git a/demo/rust/filedemo/Cargo.toml b/demo/rust/filedemo/Cargo.toml index ad4c4202c..ec7d1a133 100644 --- a/demo/rust/filedemo/Cargo.toml +++ b/demo/rust/filedemo/Cargo.toml @@ -8,4 +8,4 @@ chrono = "0.4.23" clap = "3.2.3" hound = "3.4.0" itertools = "0.10.3" -pv_rhino = { path = "../../../binding/rust" } +pv_rhino = "=3.0.3" diff --git a/demo/rust/micdemo/Cargo.lock b/demo/rust/micdemo/Cargo.lock index 77e4e2bf8..1103ebd3b 100644 --- a/demo/rust/micdemo/Cargo.lock +++ b/demo/rust/micdemo/Cargo.lock @@ -278,6 +278,8 @@ dependencies = [ [[package]] name = "pv_rhino" version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56cba466f05dbc2c5a69cc21904fc3acb9ea4235a0e432b4a68c155c963534c0" dependencies = [ "libc", "libloading 0.7.4", diff --git a/demo/rust/micdemo/Cargo.toml b/demo/rust/micdemo/Cargo.toml index f524d5b3b..604dab125 100644 --- a/demo/rust/micdemo/Cargo.toml +++ b/demo/rust/micdemo/Cargo.toml @@ -10,4 +10,4 @@ ctrlc = "3.2.2" hound = "3.4.0" itertools = "0.10.3" pv_recorder = "=1.2.2" -pv_rhino = { path = "../../../binding/rust" } +pv_rhino = "=3.0.3"