diff --git a/.gitignore b/.gitignore index 3f0b40e..6260619 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,6 @@ logs/ *.pptx 관련 논문/ 발표 자료/ + + +.vscode/ \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 78e0f6b..11e9e8a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,23 +1,2 @@ -stages: - - sonarqube-check - -sonarqube-check: - stage: sonarqube-check - image: - name: sonarsource/sonar-scanner-cli:5.0 - entrypoint: [""] - variables: - SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar" # Defines the location of the analysis task cache - GIT_DEPTH: "0" # Tells git to fetch all the branches of the project, required by the analysis task - cache: - key: "${CI_JOB_NAME}" - paths: - - .sonar/cache - script: - - sonar-scanner - allow_failure: true - only: - - merge_requests - - master - - main - - develop +include: + - local: .gitlab/ci/*.gitlab-ci.yml \ No newline at end of file diff --git a/.gitlab/ci/depenabot.gitlab-ci.yml b/.gitlab/ci/depenabot.gitlab-ci.yml new file mode 100644 index 0000000..f8f498b --- /dev/null +++ b/.gitlab/ci/depenabot.gitlab-ci.yml @@ -0,0 +1,7 @@ +include: + - component: gitlab.com/dependabot-gitlab/dependabot-standalone/template@3.14.2 + inputs: + gitlab_access_token: gitlab-access-token + github_access_token: github-access-token + rules: + - if: $PACKAGE_MANAGER_SET diff --git a/.gitlab/ci/sonarqube-check.gitlab-ci.yml b/.gitlab/ci/sonarqube-check.gitlab-ci.yml new file mode 100644 index 0000000..05a2bdf --- /dev/null +++ b/.gitlab/ci/sonarqube-check.gitlab-ci.yml @@ -0,0 +1,20 @@ +.sonarqube-check: + stage: sonarqube-check + image: + name: sonarsource/sonar-scanner-cli:5.0 + entrypoint: [""] + variables: + SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar" # Defines the location of the analysis task cache + GIT_DEPTH: "0" # Tells git to fetch all the branches of the project, required by the analysis task + cache: + key: "${CI_JOB_NAME}" + paths: + - .sonar/cache + script: + - sonar-scanner + allow_failure: true + only: + - merge_requests + - master + - main + - develop diff --git a/.vscode/settings.json b/.vscode/settings.json index d99f2f3..fb23dd1 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,5 +2,9 @@ "[python]": { "editor.defaultFormatter": "ms-python.black-formatter" }, - "python.formatting.provider": "none" + "python.formatting.provider": "none", + "sonarlint.connectedMode.project": { + "connectionId": "https-sonar-pieroot-xyz", + "projectKey": "pieroot_pso_6a2f36a9-2688-4900-a4a5-5be85f36f75a" + } } \ No newline at end of file