Merge branch 'fix-git-filter-repo-dependency-order' into 'master'

Fix build order of git-filter-repo to fix unwanted rebuilds

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7366

Merged-by: Robert Marshall <rmarshall@gitlab.com>
Approved-by: Andrew Patterson <apatterson@gitlab.com>
Approved-by: Robert Marshall <rmarshall@gitlab.com>
Co-authored-by: Balasankar 'Balu' C <balasankar@gitlab.com>

Author: rmarshall-gitlab

config/projects/gitlab.rb

@@ -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,

config/software/git-filter-repo.rb

@@ -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

config/software/gitaly.rb

@@ -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