From 6e64705d68f75e366bcebc9e2aeb9803df42e772 Mon Sep 17 00:00:00 2001 From: Ruslan Pislari Date: Tue, 21 Jan 2025 14:11:28 +0200 Subject: [PATCH 1/2] fix: use ubuntu-22.04 as runner for cli to avoid glibc not found error --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 10252e9..806c800 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -33,7 +33,7 @@ jobs: matrix: include: - build: linux - os: ubuntu-latest + os: ubuntu-22.04 target: x86_64-unknown-linux-gnu - build: macos From 32ba049c32237428f21d7ad63fc13bc2d3a7bf63 Mon Sep 17 00:00:00 2001 From: Ruslan Pislari Date: Tue, 21 Jan 2025 14:17:42 +0200 Subject: [PATCH 2/2] fix: change cli tool name to fastedge-run --- .github/workflows/release.yaml | 2 +- Cargo.lock | 50 +++++++++++++++++----------------- Cargo.toml | 2 +- README.md | 10 +++---- src/main.rs | 2 +- 5 files changed, 33 insertions(+), 33 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 806c800..12b3d8c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -64,7 +64,7 @@ jobs: shell: bash run: | # Replace with the name of your binary - binary_name="cli" + binary_name="fastedge-run" dirname="$binary_name-${{ env.VERSION }}-${{ matrix.target }}" mkdir "$dirname" diff --git a/Cargo.lock b/Cargo.lock index 29d3293..8a1585f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -496,31 +496,6 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" -[[package]] -name = "cli" -version = "0.9.3" -dependencies = [ - "anyhow", - "async-trait", - "bytesize", - "clap", - "dictionary", - "http 1.2.0", - "http-backend", - "http-body-util", - "http-service", - "hyper 1.5.2", - "hyper-tls", - "hyper-util", - "pretty_env_logger", - "runtime", - "secret", - "shellflip", - "smol_str", - "tokio", - "wasmtime", -] - [[package]] name = "clickhouse" version = "0.13.1" @@ -930,6 +905,31 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" +[[package]] +name = "fastedge-run" +version = "0.9.3" +dependencies = [ + "anyhow", + "async-trait", + "bytesize", + "clap", + "dictionary", + "http 1.2.0", + "http-backend", + "http-body-util", + "http-service", + "hyper 1.5.2", + "hyper-tls", + "hyper-util", + "pretty_env_logger", + "runtime", + "secret", + "shellflip", + "smol_str", + "tokio", + "wasmtime", +] + [[package]] name = "fastrand" version = "2.3.0" diff --git a/Cargo.toml b/Cargo.toml index def29ad..85c14f3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,7 +34,7 @@ unused_import_braces = 'warn' all = 'allow' [package] -name = "cli" +name = "fastedge-run" version.workspace = true edition.workspace = true publish.workspace = true diff --git a/README.md b/README.md index a96bc67..f3f7353 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -FastEdge CLI and common runtime libraries +FastEdge run tool and common runtime libraries # Setting up @@ -17,11 +17,11 @@ Run `git submodule update --init --recursive -f` ## Building -Run `cargo build --release` to build CLI tool and all required dependencies. +Run `cargo build --release` to build fastedge app run tool and all required dependencies. ## Releasing -CLI tool and FastEdge lib are released with GitHub using [cargo-release](https://github.com/crate-ci/cargo-release) tool. +Fastedge run tool and FastEdge lib are released with GitHub using [cargo-release](https://github.com/crate-ci/cargo-release) tool. The release process includes next steps: * increment crate version in Cargo.toml * generate CHANGELOG.md file @@ -67,5 +67,5 @@ Note: It also creates a PR for `releases/**` branch to merge it to `main` as soo # Running -## CLI -* run with `cargo run --bin cli -- --help` flag to list CLI commands and options +## Fastedge Run Tool +* run with `cargo run --bin fastedge-run -- --help` flag to list run commands and options diff --git a/src/main.rs b/src/main.rs index a0a91d6..593f09a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -33,7 +33,7 @@ use wasmtime::component::Component; use wasmtime::{Engine, Module}; #[derive(Debug, Parser)] -#[command(name = "cli")] +#[command(name = "fastedge-run")] #[command(about = "FastEdge test tool", long_about = None)] struct Cli { #[command(subcommand)]