Skip to content

Commit

Permalink
chore: centralise cargo settings and bump
Browse files Browse the repository at this point in the history
  • Loading branch information
benfdking committed Jul 29, 2024
1 parent 6c0cba4 commit f3b5f37
Show file tree
Hide file tree
Showing 10 changed files with 39 additions and 37 deletions.
14 changes: 2 additions & 12 deletions .hacking/scripts/check_versions_match.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
#!/bin/bash

# Extract version from Cargo.toml
cargo_version_cli=$(grep "^version" rust/cli/Cargo.toml | awk -F '"' '{print $2}')
cargo_version_core=$(grep "^version" rust/core/Cargo.toml | awk -F '"' '{print $2}')
cargo_version_databases=$(grep "^version" rust/quary-databases/Cargo.toml | awk -F '"' '{print $2}')
cargo_version_dbt=$(grep "^version" rust/dbt-converter/Cargo.toml | awk -F '"' '{print $2}')
cargo_version_sqlinference=$(grep "^version" rust/sqlinference/Cargo.toml | awk -F '"' '{print $2}')
cargo_version_wasm=$(grep "^version" rust/wasm-binding/Cargo.toml | awk -F '"' '{print $2}')
cargo_version=$(grep "^version" Cargo.toml | awk -F '"' '{print $2}')

# Extract version from package.json
ts_version=$(jq -r '.version' js/packages/quary-extension/package.json)
Expand All @@ -22,12 +17,7 @@ compare_versions() {
fi
}

compare_versions "$cargo_version_cli" "$ts_version"
compare_versions "$cargo_version_core" "$ts_version"
compare_versions "$cargo_version_databases" "$ts_version"
compare_versions "$cargo_version_dbt" "$ts_version"
compare_versions "$cargo_version_sqlinference" "$ts_version"
compare_versions "$cargo_version_wasm" "$ts_version"
compare_versions "$cargo_version" "$ts_version"

# If GitHub release version is provided, compare it as well
if [ -n "$github_release_version" ]; then
Expand Down
12 changes: 6 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,11 @@ members = [
]
resolver = "2"

[workspace.package]
version = "0.4.0"
edition = "2021"
license = "Apache-2.0"
rust-version = "1.80.0"

[workspace.dependencies]
cargo-nextest = "0.9"
2 changes: 1 addition & 1 deletion js/packages/quary-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"description": "",
"repository": "https://github.com/quarylabs/quary",
"icon": "images/quary-logo.png",
"version": "0.3.3",
"version": "0.4.0",
"engines": {
"vscode": "^1.91.0"
},
Expand Down
7 changes: 4 additions & 3 deletions rust/cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
[package]
name = "quary"
version = "0.3.3"
edition = "2021"
rust-version = "1.80.0"
version.workspace = true
edition.workspace = true
license.workspace = true
rust-version.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
7 changes: 4 additions & 3 deletions rust/core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
[package]
name = "quary-core"
version = "0.3.3"
authors = ["Ben King <9087625+benfdking@users.noreply.github.com>"]
edition = "2021"
rust-version = "1.80.0"
version.workspace = true
edition.workspace = true
license.workspace = true
rust-version.workspace = true

[lib]
crate-type = ["cdylib", "rlib"]
Expand Down
7 changes: 4 additions & 3 deletions rust/dbt-converter/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
[package]
name = "dbt-converter"
version = "0.3.3"
edition = "2021"
rust-version = "1.80.0"
version.workspace = true
edition.workspace = true
license.workspace = true
rust-version.workspace = true

[dependencies]
serde_yaml = "0.9"
Expand Down
7 changes: 4 additions & 3 deletions rust/quary-databases/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
[package]
name = "quary-databases"
version = "0.3.3"
edition = "2021"
rust-version = "1.80.0"
version.workspace = true
edition.workspace = true
license.workspace = true
rust-version.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
7 changes: 4 additions & 3 deletions rust/sqlinference/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
[package]
name = "sqlinference"
version = "0.3.3"
edition = "2021"
rust-version = "1.80.0"
version.workspace = true
edition.workspace = true
license.workspace = true
rust-version.workspace = true

[lib]

Expand Down
7 changes: 4 additions & 3 deletions rust/wasm-binding/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
[package]
name = "quary-wasm-bindgen"
version = "0.3.3"
authors = ["Ben King <9087625+benfdking@users.noreply.github.com>"]
edition = "2021"
rust-version = "1.80.0"
version.workspace = true
edition.workspace = true
license.workspace = true
rust-version.workspace = true

[lib]
crate-type = ["cdylib", "rlib"]
Expand Down

0 comments on commit f3b5f37

Please sign in to comment.