diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bcb7f4b91..dd4d7c8ca 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: - uses: actions-rs/cargo@v1 with: command: install - args: --path . --debug + args: --path crates/flowistry_ide --debug - run: npm install && npm run build working-directory: ide - run: pip3 install -r scripts/requirements.txt && python3 scripts/check_versions.py diff --git a/Cargo.lock b/Cargo.lock index f14e9fb7a..7fad5d7e3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -97,7 +97,7 @@ dependencies = [ [[package]] name = "flowistry" -version = "0.3.19" +version = "0.3.20" dependencies = [ "anyhow", "fluid-let", @@ -108,7 +108,7 @@ dependencies = [ [[package]] name = "flowistry_ide" -version = "0.3.19" +version = "0.3.20" dependencies = [ "anyhow", "cargo_metadata", @@ -127,7 +127,7 @@ dependencies = [ [[package]] name = "flowistry_ifc" -version = "0.3.19" +version = "0.3.20" dependencies = [ "anyhow", "env_logger", @@ -137,7 +137,7 @@ dependencies = [ [[package]] name = "flowistry_ifc_traits" -version = "0.1.0" +version = "0.3.20" [[package]] name = "fluid-let" diff --git a/crates/flowistry/Cargo.toml b/crates/flowistry/Cargo.toml index 67b275cce..c4dce34ba 100644 --- a/crates/flowistry/Cargo.toml +++ b/crates/flowistry/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "flowistry" -version = "0.3.19" +version = "0.3.20" edition = "2021" authors = ["Will Crichton "] description = "Powerful IDE tools for Rust" diff --git a/crates/flowistry_ide/Cargo.toml b/crates/flowistry_ide/Cargo.toml index 0acb0ceb0..175df0bcc 100644 --- a/crates/flowistry_ide/Cargo.toml +++ b/crates/flowistry_ide/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "flowistry_ide" -version = "0.3.19" +version = "0.3.20" edition = "2021" [package.metadata.rust-analyzer] diff --git a/crates/flowistry_ifc/Cargo.toml b/crates/flowistry_ifc/Cargo.toml index 93b2fe220..66289c712 100644 --- a/crates/flowistry_ifc/Cargo.toml +++ b/crates/flowistry_ifc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "flowistry_ifc" -version = "0.3.19" +version = "0.3.20" edition = "2021" [dependencies] diff --git a/crates/flowistry_ifc_traits/Cargo.toml b/crates/flowistry_ifc_traits/Cargo.toml index cd7a8fb02..f1e24c12b 100644 --- a/crates/flowistry_ifc_traits/Cargo.toml +++ b/crates/flowistry_ifc_traits/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "flowistry_ifc_traits" -version = "0.1.0" +version = "0.3.20" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/ide/package.json b/ide/package.json index b6c2f13f3..66313c0dd 100644 --- a/ide/package.json +++ b/ide/package.json @@ -12,7 +12,7 @@ "type": "git" }, "description": "Powerful IDE tools for Rust", - "version": "0.3.19", + "version": "0.3.20", "engines": { "vscode": "^1.54.0" }, diff --git a/ide/src/setup.ts b/ide/src/setup.ts index 3864d9aea..707386226 100644 --- a/ide/src/setup.ts +++ b/ide/src/setup.ts @@ -163,7 +163,7 @@ export async function setup( } catch (e: any) { log("Install script failed with error:", e.toString()); - let cargo_cmd = `${cargo} install flowistry --version ${VERSION} --force`; + let cargo_cmd = `${cargo} install flowistry_ide --version ${VERSION} --force`; await exec_notify( cargo_cmd, "Flowistry binaries not available, instead installing Flowistry crate from source... (this may take a minute)" diff --git a/scripts/check_versions.py b/scripts/check_versions.py index 2290985f5..27576b321 100644 --- a/scripts/check_versions.py +++ b/scripts/check_versions.py @@ -2,12 +2,10 @@ import toml import json -rust_pkg_version = toml.load(open('./Cargo.toml', 'r'))['package']['version'] js_pkg_version = json.load(open('./ide/package.json', 'r'))['version'] cli_version = sp.check_output('cargo flowistry -V', shell=True).decode('utf-8').split(' ')[1].strip() -print('Rust package version: ', rust_pkg_version) print('JS package version: ', js_pkg_version) print('CLI version: ', cli_version) -assert rust_pkg_version == js_pkg_version and js_pkg_version == cli_version +assert js_pkg_version == cli_version