From afebc1a1d5e43baeedb7dcf5dd77d27f77473e31 Mon Sep 17 00:00:00 2001 From: Pedro Valente Date: Tue, 6 Feb 2024 13:33:08 +0000 Subject: [PATCH 1/2] added release PR action --- .github/workflows/release_pr.yml | 37 ++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/workflows/release_pr.yml diff --git a/.github/workflows/release_pr.yml b/.github/workflows/release_pr.yml new file mode 100644 index 0000000..ec376bf --- /dev/null +++ b/.github/workflows/release_pr.yml @@ -0,0 +1,37 @@ +name: Open a release PR +on: + workflow_dispatch: + inputs: + crate: + description: Crate to release + required: true + type: choice + options: + - whisper_cpp + - whisper_cpp_sys + version: + description: Version to release + required: true + type: string + +jobs: + make-release-pr: + permissions: + id-token: write + pull-requests: write + contents: write + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: chainguard-dev/actions/setup-gitsign@main + - name: Install cargo-release + uses: taiki-e/install-action@v2 + with: + tool: cargo-release + - name: Update submodules + run: git submodule update --init --recursive + - uses: cargo-bins/release-pr@v2 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + version: ${{ inputs.version }} + crate-name: ${{ inputs.crate }} From d1451cca73f74e730fcc94f09cb11f8f182b4f89 Mon Sep 17 00:00:00 2001 From: Pedro Valente Date: Tue, 6 Feb 2024 13:40:28 +0000 Subject: [PATCH 2/2] updated crate dependencies --- Cargo.lock | 21 ++++++++++++--------- Cargo.toml | 8 -------- crates/whisper_cpp/Cargo.toml | 6 +++--- crates/whisper_cpp_sys/Cargo.toml | 6 +++--- crates/whisper_cpp_tests/Cargo.toml | 4 ++-- 5 files changed, 20 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9227b03..f3f078c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -49,17 +49,17 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.69.1" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ffcebc3849946a7170a05992aac39da343a90676ab392c51a4280981d6379c2" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ "bitflags 2.4.1", "cexpr", "clang-sys", + "itertools", "lazy_static", "lazycell", "log", - "peeking_take_while", "prettyplease", "proc-macro2", "quote", @@ -194,6 +194,15 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + [[package]] name = "lazy_static" version = "1.4.0" @@ -343,12 +352,6 @@ dependencies = [ "windows-targets 0.48.5", ] -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "pin-project-lite" version = "0.2.13" diff --git a/Cargo.toml b/Cargo.toml index 9bf5b97..24139c4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,13 +7,5 @@ members = [ ] [workspace.dependencies] -bindgen = "0.69.1" -cmake = "0.1.50" -derive_more = "0.99.17" -link-cplusplus = "1.0.9" thiserror = "1.0.50" tokio = "1.34.0" -tracing = "0.1.40" -wav = "1.0.0" -whisper_cpp = { path = "crates/whisper_cpp", default-features = false } -whisper_cpp_sys = { path = "crates/whisper_cpp_sys", default-features = false } diff --git a/crates/whisper_cpp/Cargo.toml b/crates/whisper_cpp/Cargo.toml index 256e385..24c1174 100644 --- a/crates/whisper_cpp/Cargo.toml +++ b/crates/whisper_cpp/Cargo.toml @@ -12,11 +12,11 @@ publish = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] +derive_more = "0.99.17" thiserror = { workspace = true } -derive_more = { workspace = true } tokio = { workspace = true, features = ["sync", "rt"] } -tracing = { workspace = true } -whisper_cpp_sys = { workspace = true, default-features = false } +tracing = "0.1.40" +whisper_cpp_sys = { version = "^0.2.0", path = "../whisper_cpp_sys", default-features = false } [features] default = ["compat", "native"] diff --git a/crates/whisper_cpp_sys/Cargo.toml b/crates/whisper_cpp_sys/Cargo.toml index 1c4bdb0..f3cd7c5 100644 --- a/crates/whisper_cpp_sys/Cargo.toml +++ b/crates/whisper_cpp_sys/Cargo.toml @@ -11,11 +11,11 @@ publish = true links = "whisper" [dependencies] -link-cplusplus = { workspace = true } +link-cplusplus = "1.0.9" [build-dependencies] -bindgen = { workspace = true } -cmake = { workspace = true } +bindgen = "0.69.4" +cmake = "0.1.50" [features] default = ["compat", "native"] diff --git a/crates/whisper_cpp_tests/Cargo.toml b/crates/whisper_cpp_tests/Cargo.toml index b65473a..2594091 100644 --- a/crates/whisper_cpp_tests/Cargo.toml +++ b/crates/whisper_cpp_tests/Cargo.toml @@ -8,5 +8,5 @@ edition = "2021" [dependencies] thiserror = { workspace = true } tokio = { workspace = true, features = ["full"] } -wav = { workspace = true } -whisper_cpp = { workspace = true, features = ["compat", "native"] } +wav = "1.0.0" +whisper_cpp = { version = "^0.2.0", path = "../whisper_cpp", default-features = false, features = ["compat", "native"] }