From 56e4166ee8a92cc9ae050c8b335dd3a817577eb9 Mon Sep 17 00:00:00 2001 From: strawberry Date: Wed, 29 Nov 2023 23:19:53 -0500 Subject: [PATCH] never let clippy fail, use CARGO_PKG_NAME, allow issues on gh, simplify regex a tad Signed-off-by: strawberry --- .github/ISSUE_TEMPLATE/Issue.md | 11 ----------- .gitlab-ci.yml | 2 -- src/api/server_server.rs | 2 +- src/service/admin/mod.rs | 6 +++--- 4 files changed, 4 insertions(+), 17 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/Issue.md diff --git a/.github/ISSUE_TEMPLATE/Issue.md b/.github/ISSUE_TEMPLATE/Issue.md deleted file mode 100644 index 78896651..00000000 --- a/.github/ISSUE_TEMPLATE/Issue.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -name: "Issue with / Feature Request for Conduit" -about: "Please file issues on GitLab: https://gitlab.com/famedly/conduit/-/issues/new" -title: "CLOSE ME" ---- - - - -**⚠️ Conduit development does not happen on GitHub. Issues opened here will not be addressed** - -Please open issues on GitLab: https://gitlab.com/famedly/conduit/-/issues/new diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f5ab4246..1bf9e86f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -145,7 +145,6 @@ test:cargo: test:clippy: extends: .test-shared-settings - allow_failure: true before_script: - rustup component add clippy - apt-get update && apt-get -y --no-install-recommends install libclang-dev # dependency for rocksdb @@ -166,7 +165,6 @@ test:format: test:audit: extends: .test-shared-settings - allow_failure: true script: - cargo audit --color always || true - cargo audit --stale --json | gitlab-report -p audit > gl-sast-report.json diff --git a/src/api/server_server.rs b/src/api/server_server.rs index 1dffb481..9df1beef 100644 --- a/src/api/server_server.rs +++ b/src/api/server_server.rs @@ -572,7 +572,7 @@ pub async fn get_server_version_route( Ok(get_server_version::v1::Response { server: Some(get_server_version::v1::Server { - name: Some(env!("CARGO_CRATE_NAME").to_owned()), + name: Some(env!("CARGO_PKG_NAME").to_owned()), version: Some(env!("CARGO_PKG_VERSION").to_owned()), }), }) diff --git a/src/service/admin/mod.rs b/src/service/admin/mod.rs index 7240e246..15f2220a 100644 --- a/src/service/admin/mod.rs +++ b/src/service/admin/mod.rs @@ -1316,7 +1316,7 @@ impl Service { // And are converted to: // -V, --version: Prints version information // (?m) enables multi-line mode for ^ and $ - let re = Regex::new("(?m)^ (([a-zA-Z_&;-]+(, )?)+) +(.*)$") + let re = Regex::new("(?m)^ {4}(([a-zA-Z_&;-]+(, )?)+) +(.*)$") .expect("Regex compilation should not fail"); let text = re.replace_all(&text, "$1: $4"); @@ -1348,13 +1348,13 @@ impl Service { // Improve the usage section let text = if command_body.is_empty() { // Wrap the usage line in code tags - let re = Regex::new("(?m)^USAGE:\n (@conduit:.*)$") + let re = Regex::new("(?m)^USAGE:\n {4}(@conduit:.*)$") .expect("Regex compilation should not fail"); re.replace_all(&text, "USAGE:\n$1").to_string() } else { // Wrap the usage line in a code block, and add a yaml block example // This makes the usage of e.g. `register-appservice` more accurate - let re = Regex::new("(?m)^USAGE:\n (.*?)\n\n") + let re = Regex::new("(?m)^USAGE:\n {4}(.*?)\n\n") .expect("Regex compilation should not fail"); re.replace_all(&text, "USAGE:\n
$1[nobr]\n[commandbodyblock]
") .replace("[commandbodyblock]", &command_body)