diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 8d73fddb..a082c9fe 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -124,12 +124,12 @@ jobs: working-directory: common/jenkins-agents/rust/docker run: | docker build --tag agent-rust-test-ubi8 --file Dockerfile.ubi8 \ - --build-arg rustVersion=1.88.0 \ + --build-arg rustVersion=1.92.0 \ --build-arg rustToolchain=x86_64-unknown-linux-gnu \ - --build-arg cargoNextestVersion=0.9.94 \ - --build-arg cargoLlvmCovVersion=0.6.16 \ - --build-arg cargoGenerateVersion=0.23.3 \ - --build-arg cargoDenyVersion=0.18.2 \ + --build-arg cargoNextestVersion=0.9.116 \ + --build-arg cargoLlvmCovVersion=0.6.21 \ + --build-arg cargoGenerateVersion=0.23.7 \ + --build-arg cargoDenyVersion=0.18.9 \ . jenkins-agent-terraform-2306-ubi8: diff --git a/be-rust-axum/rust-template/.pre-commit-config.yaml b/be-rust-axum/rust-template/.pre-commit-config.yaml index 24f4276c..03db34c3 100644 --- a/be-rust-axum/rust-template/.pre-commit-config.yaml +++ b/be-rust-axum/rust-template/.pre-commit-config.yaml @@ -4,7 +4,7 @@ repos: hooks: - id: gitleaks - repo: https://github.com/EmbarkStudios/cargo-deny - rev: 0.18.2 + rev: 0.18.9 hooks: - id: cargo-deny args: ["--all-features", "check"] # optionally modify the arguments for cargo-deny (default arguments shown here) diff --git a/be-rust-axum/rust-template/Cargo.toml b/be-rust-axum/rust-template/Cargo.toml index f0de2da4..8ff582e8 100644 --- a/be-rust-axum/rust-template/Cargo.toml +++ b/be-rust-axum/rust-template/Cargo.toml @@ -3,7 +3,7 @@ name = "{{project-name}}" version = "0.1.0" edition = "2024" -rust-version = "1.88" +rust-version = "1.92" description = "{{project-name}} component - from the OpenDevStack Rust QuickStarter." license = "MIT OR Apache-2.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -25,7 +25,13 @@ bytes = "1.7" thiserror = "2.0" tracing = "0.1" -tracing-subscriber = { version = "0.3", features = ["tracing", "env-filter", "json", "ansi", "fmt"] } +tracing-subscriber = { version = "0.3", features = [ + "tracing", + "env-filter", + "json", + "ansi", + "fmt", +] } lazy_static = "1.5" @@ -73,5 +79,7 @@ dotenvy = "0.15" [dev-dependencies] # mockito = "1.7" # mockito is recommended when requiring mocking network requests to either external or internal services -temp-env = { version = "0.3", features = ["async_closure"] } # it is highly recommended the usage of cargo nextest run instead of cargo test; this way each test runs on its own process +temp-env = { version = "0.3", features = [ + "async_closure", +] } # it is highly recommended the usage of cargo nextest run instead of cargo test; this way each test runs on its own process tower = { version = "0.5", features = ["util"] } diff --git a/be-rust-axum/rust-template/metadata.yml b/be-rust-axum/rust-template/metadata.yml index fba0aa1c..47428b55 100644 --- a/be-rust-axum/rust-template/metadata.yml +++ b/be-rust-axum/rust-template/metadata.yml @@ -1,6 +1,6 @@ --- name: Axum - Rust web framework -description: "Axum is an ergonomic and modular web framework built with Tokio, Tower, and Hyper; written in Rust. Technologies: Axum 0.8.x, Rust 1.88.x" +description: "Axum is an ergonomic and modular web framework built with Tokio, Tower, and Hyper; written in Rust. Technologies: Axum 0.8.x, Rust 1.92.x" supplier: https://github.com/tokio-rs/axum version: 4.x type: ods diff --git a/be-rust-axum/rust-template/rust-toolchain.toml b/be-rust-axum/rust-template/rust-toolchain.toml index e88baf10..f19782d3 100644 --- a/be-rust-axum/rust-template/rust-toolchain.toml +++ b/be-rust-axum/rust-template/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.88.0" +channel = "1.92.0" diff --git a/common/jenkins-agents/rust/ocp-config/bc.yml b/common/jenkins-agents/rust/ocp-config/bc.yml index b047284c..360fec8c 100644 --- a/common/jenkins-agents/rust/ocp-config/bc.yml +++ b/common/jenkins-agents/rust/ocp-config/bc.yml @@ -19,7 +19,7 @@ parameters: - name: RUST_VERSION description: "The Rust version" required: true - value: "1.88.0" + value: "1.92.0" - name: RUST_TOOLCHAIN description: "The Rust target toolchain" required: true @@ -27,19 +27,19 @@ parameters: - name: CARGO_NEXTEST_VERSION description: "The Cargo Nextest testing framework version" required: true - value: "0.9.94" + value: "0.9.116" - name: CARGO_LLVM_COV_VERSION description: "The Cargo LLVM Coverage tool version" required: true - value: "0.6.16" + value: "0.6.21" - name: CARGO_GENERATE_VERSION description: "The Cargo Generate tool version" required: true - value: "0.23.3" + value: "0.23.7" - name: CARGO_DENY_VERSION description: "The Cargo Deny tool version" required: true - value: "0.18.2" + value: "0.18.9" objects: - apiVersion: build.openshift.io/v1 kind: BuildConfig diff --git a/docs/modules/jenkins-agents/pages/rust.adoc b/docs/modules/jenkins-agents/pages/rust.adoc index 2a3f7659..ab2a1016 100644 --- a/docs/modules/jenkins-agents/pages/rust.adoc +++ b/docs/modules/jenkins-agents/pages/rust.adoc @@ -11,7 +11,7 @@ Rust installation is managed by `rustup`, which offers a convenient way to load And, the version defined in the `rust-toolchain` file is the one that the Jenkins Agent will use (even if it is not the default). That file MUST be in the root of the projects' repository. -Default Minimum Supported Rust Version (MSRV) **1.88**. +Default Minimum Supported Rust Version (MSRV) **1.92**. Default Rust edition in use is **2024**. See https://doc.rust-lang.org/edition-guide/introduction.html[Rust Edition Guide] for further information. diff --git a/docs/modules/quickstarters/pages/be-rust-axum.adoc b/docs/modules/quickstarters/pages/be-rust-axum.adoc index 9b8f360c..fd0ec3cb 100644 --- a/docs/modules/quickstarters/pages/be-rust-axum.adoc +++ b/docs/modules/quickstarters/pages/be-rust-axum.adoc @@ -71,7 +71,7 @@ It contains the basic setup for Docker, Jenkins, SonarQube and OpenShift. == Frameworks used -* https://www.rust-lang.org/[Rust 1.88.x] +* https://www.rust-lang.org/[Rust 1.92.x] * https://github.com/tokio-rs/axum[Axum 0.8.x] * https://nexte.st/[Nextest 0.9.x] * https://github.com/taiki-e/cargo-llvm-cov/[LLVM coverage 0.6.x]