diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-02-17 11:43:27 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-02-17 13:51:08 +0300 |
| commit | 01ca506de00b040695520655d61f57e2eef309f2 (patch) | |
| tree | bea447cc50f62866bef725fee25ecb2973a91347 /.gitlab-ci.yml | |
| parent | 094292fc51484af1400be75b7bb1431157cda8b0 (diff) | |
Makefile: Build and install dependencies in separate dir
The libgit2 and git dependencies need to be cloned, built and installed.
Over time, this has resulted in some clutter in our build directories,
where we have `_build/src/{git,libgit2}`, `_build/{git,libgit2}` and
`_build/src/libgit2/build`. This commit ends this wild growth and
instead introduces a new `_build/deps` directory which hosts a source,
build and install directory for each dependency.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cd6889c86..3b33778be 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,8 +46,7 @@ danger-review: - ruby/Gemfile.lock prefix: git-${GIT_VERSION}-ruby-${RUBY_VERSION} paths: - - _build/git - - _build/libgit2 + - _build/deps - _build/Makefile.sha256 - ruby/vendor/bundle @@ -62,8 +61,7 @@ danger-review: - ruby/Gemfile.lock prefix: git-${GIT_VERSION}-ruby-${RUBY_VERSION} paths: - - _build/git - - _build/libgit2 + - _build/deps - _build/Makefile.sha256 - ruby/vendor/bundle policy: pull @@ -149,7 +147,7 @@ test: image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.29 script: - go version - - _build/git/bin/git version + - _build/deps/git/install/bin/git version # This command will make all directories except of our build directory and Ruby code unwritable. # The purpose is to verify that there is no test which writes into those directories anymore, as # they should all instead use a temporary directory for runtime data. |