diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-30 03:09:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-30 03:09:03 +0300 |
| commit | b72218d98e11514569939cf475d3c626fed445d1 (patch) | |
| tree | 8c69b5590ea68963673f2f4d3a886a5095f3b524 /.gitlab | |
| parent | ba537a9b5cf97308fd9fe099e0d022a9a76b66ad (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/global.gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml index 146a7067acd..f1c62e01674 100644 --- a/.gitlab/ci/global.gitlab-ci.yml +++ b/.gitlab/ci/global.gitlab-ci.yml @@ -41,6 +41,7 @@ key: files: - GITALY_SERVER_VERSION + - lib/gitlab/setup_helper.rb prefix: "gitaly-binaries-${DEBIAN-VERSION}" paths: - tmp/tests/gitaly/_build/bin/ diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 8c30fb5447e..e808a0297a6 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -161,6 +161,7 @@ .gitaly-patterns: &gitaly-patterns - "GITALY_SERVER_VERSION" + - "lib/gitlab/setup_helper.rb" .workhorse-patterns: &workhorse-patterns - "GITLAB_WORKHORSE_VERSION" @@ -274,7 +275,9 @@ - "lib/gitlab/markdown_cache/active_record/**/*" - "config/prometheus/common_metrics.yml" # Used by Gitlab::DatabaseImporters::CommonMetrics::Importer - "{,ee/,jh/}app/models/project_statistics.rb" # Used to calculate sizes in migration specs - - "GITALY_SERVER_VERSION" # Has interactions with background migrations:https://gitlab.com/gitlab-org/gitlab/-/issues/336538 + # Gitaly has interactions with background migrations: https://gitlab.com/gitlab-org/gitlab/-/issues/336538 + - "GITALY_SERVER_VERSION" + - "lib/gitlab/setup_helper.rb" # CI changes - ".gitlab-ci.yml" - ".gitlab/ci/**/*" |