diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-28 12:11:43 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-28 12:11:43 +0300 |
| commit | c00c766f13d6e0291831a25434eb54057708cc47 (patch) | |
| tree | b1db8dd9d5b109486f107be231dc0edb82457d61 /.gitlab | |
| parent | 99f384810fcb98be5dc45c22552eb80a76021387 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/rails/shared.gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab/ci/static-analysis.gitlab-ci.yml | 5 | ||||
| -rw-r--r-- | .gitlab/ci/templates/gem.gitlab-ci.yml | 6 |
3 files changed, 10 insertions, 3 deletions
diff --git a/.gitlab/ci/rails/shared.gitlab-ci.yml b/.gitlab/ci/rails/shared.gitlab-ci.yml index 19eacd8c54c..95f1210f05c 100644 --- a/.gitlab/ci/rails/shared.gitlab-ci.yml +++ b/.gitlab/ci/rails/shared.gitlab-ci.yml @@ -84,7 +84,7 @@ include: bundle exec relate-failure-issue --input-files "rspec/rspec-*.json" --system-log-files "log" --project "gitlab-org/gitlab" --token "${TEST_FAILURES_PROJECT_TOKEN}"; fi if [ "$CREATE_RAILS_SLOW_TEST_ISSUES" == "true" ]; then - bundle exec slow-test-issues --input-files "rspec/rspec-*.json" --project "gitlab-org-sandbox/rails-test-failures" --token "${RAILS_TEST_FAILURES_PROJECT_TOKEN}"; + bundle exec slow-test-issues --input-files "rspec/rspec-*.json" --project "gitlab-org/gitlab" --token "${TEST_FAILURES_PROJECT_TOKEN}"; fi - echo -e "\e[0Ksection_end:`date +%s`:report_results_section\r\e[0K" diff --git a/.gitlab/ci/static-analysis.gitlab-ci.yml b/.gitlab/ci/static-analysis.gitlab-ci.yml index 4f990410b9d..3344bb3a06d 100644 --- a/.gitlab/ci/static-analysis.gitlab-ci.yml +++ b/.gitlab/ci/static-analysis.gitlab-ci.yml @@ -194,13 +194,14 @@ semgrep-appsec-custom-rules: script: # Required to avoid a timeout https://github.com/returntocorp/semgrep/issues/5395 - git fetch origin master + - git clone $CUSTOM_RULES_REPOSITORY "${CI_BUILDS_DIR}/sast-custom-rules" # Include/exclude list isn't ideal https://github.com/returntocorp/semgrep/issues/5399 - | - semgrep ci --gitlab-sast --metrics off --config $CUSTOM_RULES_URL \ + semgrep ci --gitlab-sast --metrics off --config "${CI_BUILDS_DIR}/sast-custom-rules" \ --include app --include lib --include workhorse \ --exclude '*_test.go' --exclude spec --exclude qa > gl-sast-report.json || true variables: - CUSTOM_RULES_URL: https://gitlab.com/gitlab-com/gl-security/appsec/sast-custom-rules/-/raw/main/gitlab-sast-rules/rules.yml + CUSTOM_RULES_REPOSITORY: https://gitlab.com/gitlab-com/gl-security/appsec/sast-custom-rules.git artifacts: expire_in: 30 days paths: diff --git a/.gitlab/ci/templates/gem.gitlab-ci.yml b/.gitlab/ci/templates/gem.gitlab-ci.yml index f1ee3426070..f17e168c1af 100644 --- a/.gitlab/ci/templates/gem.gitlab-ci.yml +++ b/.gitlab/ci/templates/gem.gitlab-ci.yml @@ -16,8 +16,14 @@ spec: changes: - "$[[inputs.gem_path_prefix]]$[[inputs.gem_name]]/**/*" - ".gitlab/ci/gitlab-gems.gitlab-ci.yml" + - ".gitlab/ci/vendored-gems.gitlab-ci.yml" - ".gitlab/ci/templates/gem.gitlab-ci.yml" - "gems/gem.gitlab-ci.yml" + # Ensure new cop in the monolith don't break internal gems Rubocop checks: https://gitlab.com/gitlab-org/gitlab/-/issues/419915 + - ".rubocop.yml" + - "rubocop/**/*" + - ".rubocop_todo/**/*" + gems $[[inputs.gem_name]]: extends: ".gems:rules:$[[inputs.gem_name]]" |