diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2aed9badeffe18b9166be67f115d6e77e6c89e28..f05c2cf1514d5874c1cafaf7ce24ea7db4b6e672 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,6 +21,10 @@ include: - remote: 'https://api.r2devops.io/job/r/gitlab/r2devops/hub/docker_build@latest.yaml' - remote: 'https://api.r2devops.io/job/r/gitlab/r2devops/hub/gitleaks@latest.yaml' +gitleaks: + stage: build_test + cache: [ ] + check-format: stage: build_test image: rust:$RUST_VERSION @@ -30,10 +34,9 @@ check-format: - cargo fmt --all -- --check - cargo clippy -- -D warnings allow_failure: true - -gitleaks: - stage: build_test - cache: [ ] + rules: + - if: $CI_COMMIT_REF_NAME == 'main' + - if: $CI_PIPELINE_SOURCE == "merge_request_event" test-rust-current: stage: build_test @@ -45,7 +48,7 @@ test-rust-current: rules: - if: $CI_COMMIT_REF_NAME == 'main' - if: $CI_PIPELINE_SOURCE == "merge_request_event" - + test-rust-nightly: extends: test-rust-current diff --git a/src/diagnosis/gitlab_connection.rs b/src/diagnosis/gitlab_connection.rs index 5f24d3cda5b106fd7b4b4fd90eabefc38f53dddf..e602a4d47134f51676d885d1199e355e3487483f 100644 --- a/src/diagnosis/gitlab_connection.rs +++ b/src/diagnosis/gitlab_connection.rs @@ -9,8 +9,8 @@ use regex::Regex; use serde::{Deserialize, Serialize}; use crate::diagnosis::{ - ARTIFACT_JOBS_LIMIT, PACKAGE_REGISTRY_LIMIT, REPO_LIMIT, Reportable, ReportJob, ReportPending, - ReportStatus, STORAGE_LIMIT, warning_if, + warning_if, ReportJob, ReportPending, ReportStatus, Reportable, ARTIFACT_JOBS_LIMIT, + PACKAGE_REGISTRY_LIMIT, REPO_LIMIT, STORAGE_LIMIT, }; use crate::fl; @@ -119,10 +119,15 @@ impl ConnectionJob { token: Option<String>, ) -> Result<(Gitlab, Project)> { println!("INFO: Project server : {server}"); - println!("INFO: Project token : {token:?}"); let client = match Self::_env_token(token)? { - GitlabToken::PrivateToken(token) => Gitlab::new(server, token)?, - GitlabToken::JobToken(token) => Gitlab::new_job_token(server, token)?, + GitlabToken::PrivateToken(token) => { + println!("INFO: Project token : {token:?}"); + Gitlab::new(server, token)? + } + GitlabToken::JobToken(token) => { + println!("INFO: Project token : {token:?}"); + Gitlab::new_job_token(server, token)? + } }; println!("INFO: Project path : {path}"); let endpoint = projects::Project::builder()