From 01813be8e15ebc6f2633388817b614b9d9d8603f Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 11 Aug 2023 08:28:36 +0100 Subject: [PATCH] ci: should deal with nestled folders now? --- .gitlab-ci.yml | 33 +++++++++++++++++++++------------ Cargo.toml | 1 - src/methods/account_recover.rs | 2 +- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3b0e72b..6260837 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,10 +25,13 @@ lint-clippy: - rustc --version - cargo version - cargo clippy - only: - changes: - - src/* - - cargo.* + rules: + - if: $CI_COMMIT_TAG + when: never + - changes: + - src/**/* + - cargo.* + when: always lint-fmt: stage: lint @@ -37,10 +40,13 @@ lint-fmt: - rustc --version - cargo version - cargo fmt -- --check - only: - changes: - - src/* - - cargo.* + rules: + - if: $CI_COMMIT_TAG + when: never + - changes: + - src/**/* + - cargo.* + when: always # has to actually compile @@ -51,10 +57,13 @@ build: - cargo version - cargo build --verbose - RUST_BACKTRACE=1 cargo test --verbose - only: - changes: - - src/* - - cargo.* + rules: + - if: $CI_COMMIT_TAG + when: never + - changes: + - src/**/* + - cargo.* + when: on_success # from https://docs.gitlab.com/ee/ci/pipelines/multi_project_pipelines.html diff --git a/Cargo.toml b/Cargo.toml index cb096e3..bc1bf5f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,6 @@ name = "skynet_ldap_backend" version = "0.1.0" edition = "2021" - # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [[bin]] name = "update_data" diff --git a/src/methods/account_recover.rs b/src/methods/account_recover.rs index 3814649..650c9d5 100644 --- a/src/methods/account_recover.rs +++ b/src/methods/account_recover.rs @@ -199,7 +199,7 @@ pub mod password { // if so then set password let tmp = PasswordModify { - // none as we are staying on the same connection + // none as we are staying on the same connection. user_id: Some(&dn), old_pass: None, new_pass: Some(pass),