Skip to content
Snippets Groups Projects
Commit 4e4c702f authored by Balasankar 'Balu' C's avatar Balasankar 'Balu' C
Browse files

Change git-filter-repo position in build order


When git-filter-repo is a dependency of gitaly, Omnibus will
place it early in the build order and, by necessity, git.

This behavior causes cache to bust frequently.  This change
re-arranges the dependency order and keeps git builds
in the later stages.

Signed-off-by: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
parent 88488449
No related branches found
No related tags found
3 merge requests!128heptapod#1534: making 1.5 the oldstable,!125heptapod#1494: make 1.5 the new stable,!123Omnibus GitLab for upstream 16.10
......@@ -163,6 +163,13 @@
dependency 'gitlab-pages'
dependency 'git'
# `git-filter-repo` is a dependency of Gitaly. But placing it there will cause
# it to be built early in the build list, which will in-turn cause `git` to be
# built early. `git`, being built from `gitaly` source will bust cache often,
# and cause unnecessary rebuilds. Hence, we are placing `git-filter-repo` as a
# project dependency after `git`
dependency 'git-filter-repo'
# gitaly needs grpc to work correctly. These native extensions are built as part
# of gitlab-rails build. So, gitlab-rails has to be built before gitaly. But
# making gitaly depend on gitlab-rails will cause it to be built earlier,
......
......@@ -27,7 +27,11 @@
skip_transitive_dependency_licensing true
dependency 'git'
# Git is marked as a project dependency to be built before `git-filter-repo`.
# Adding it as a software dependency to `git-filter-repo` will cause it to be
# rebuilt early in the build list, bust cache, and cause everything after it to
# be rebuilt.
# dependency 'git'
dependency 'python3'
build do
......
......@@ -30,7 +30,6 @@
dependency 'ruby'
dependency 'libicu'
dependency 'tomlib'
dependency 'git-filter-repo'
# Technically, gitaly depends on git also. But because of how omnibus arranges
# components to be built, this causes git to be built early in the process. But
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment