From be9993029ec1c35c392d2968bfbed9d4732d436f Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 16 Jan 2025 10:02:30 +0000 Subject: [PATCH] chore(deps): update git.kemitix.net/kemitix/rust docker tag to v4 --- .forgejo/workflows/push-main.yml | 2 +- .forgejo/workflows/push-next.yml | 2 +- Cargo.lock | 11 +++++++++++ Cargo.toml | 2 ++ Dockerfile | 2 +- crates/cli/Cargo.toml | 14 +++++++++++++- crates/core/Cargo.toml | 5 +++++ justfile | 6 ++++++ 8 files changed, 40 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/push-main.yml b/.forgejo/workflows/push-main.yml index 774b8bc..10be2e5 100644 --- a/.forgejo/workflows/push-main.yml +++ b/.forgejo/workflows/push-main.yml @@ -19,7 +19,7 @@ jobs: container: image: - git.kemitix.net/kemitix/rust:v3.1.0 + git.kemitix.net/kemitix/rust:v4.0.1 steps: - name: Checkout repository diff --git a/.forgejo/workflows/push-next.yml b/.forgejo/workflows/push-next.yml index c5f928d..bc650db 100644 --- a/.forgejo/workflows/push-next.yml +++ b/.forgejo/workflows/push-next.yml @@ -18,7 +18,7 @@ jobs: container: image: - git.kemitix.net/kemitix/rust:v3.1.0 + git.kemitix.net/kemitix/rust:v4.0.1 strategy: matrix: diff --git a/Cargo.lock b/Cargo.lock index 3f2ea29..d23c2ed 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1091,6 +1091,7 @@ dependencies = [ "lazy_static", "lettre", "mockall", + "native-tls", "notifica", "notify", "pretty_assertions", @@ -3195,6 +3196,15 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "openssl-src" +version = "300.4.1+3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faa4eac4138c62414b5622d1b31c5c304f34b406b013c079c2bbc652fdd6678c" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" version = "0.9.104" @@ -3203,6 +3213,7 @@ checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] diff --git a/Cargo.toml b/Cargo.toml index 01e05c6..477a282 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -61,6 +61,8 @@ git-url-parse = "0.4" # fs/network kxio = "4.0" +native-tls = { version = "0.2", features = ["vendored"] } + # TOML parsing serde = { version = "1.0", features = ["derive"] } diff --git a/Dockerfile b/Dockerfile index 41f0a8d..bf9c55f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # Leveraging the pre-built Docker images with # cargo-chef and the Rust toolchain -FROM git.kemitix.net/kemitix/rust:v3.1.0 AS chef +FROM git.kemitix.net/kemitix/rust:v4.0.1 AS chef WORKDIR /app FROM chef AS planner diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index b4d585a..decf38e 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -16,13 +16,22 @@ categories = { workspace = true } default = ["forgejo", "github", "tui"] forgejo = ["git-next-forge-forgejo"] github = ["git-next-forge-github"] -tui = ["ratatui", "directories", "lazy_static", "tui-scrollview", "regex", "chrono"] +tui = [ + "ratatui", + "directories", + "lazy_static", + "tui-scrollview", + "regex", + "chrono", +] [dependencies] git-next-core = { workspace = true } git-next-forge-forgejo = { workspace = true, optional = true } git-next-forge-github = { workspace = true, optional = true } +native-tls = { workspace = true } + # TUI ratatui = { workspace = true, optional = true } directories = { workspace = true, optional = true } @@ -79,6 +88,9 @@ sendmail = { workspace = true } # desktop notifications notifica = { workspace = true } +[package.metadata.cargo-machete] +ignored = ["native-tls"] + [dev-dependencies] # Testing assert2 = { workspace = true } diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index 46e73b4..f1641c8 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -21,6 +21,8 @@ forgejo = [] github = [] [dependencies] +native-tls = { workspace = true } + # logging tracing = { workspace = true } @@ -57,6 +59,9 @@ mockall = { workspace = true } #iters take-until = { workspace = true } +[package.metadata.cargo-machete] +ignored = ["native-tls"] + [dev-dependencies] # Testing assert2 = { workspace = true } diff --git a/justfile b/justfile index bed34a5..8e34adf 100644 --- a/justfile +++ b/justfile @@ -11,6 +11,12 @@ build: # cargo test --example get # cargo mutants --jobs 4 +test-in-docker: + docker run --rm -v $PWD:/app/ git.kemitix.net/kemitix/rust:latest cargo test + +shell-in-docker: + docker run --rm -it -v $PWD:/app/ git.kemitix.net/kemitix/rust:latest bash + install-hooks: @echo "Installing git hooks" cargo install cc-cli