diff options
author | Patrick Steinhardt <ps@pks.im> | 2024-04-12 06:44:32 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2024-04-12 08:47:50 -0700 |
commit | 9cdeb34b962d5c1633ac5d23ebba4e24a816242a (patch) | |
tree | a9cb921e3951506e7eb452257547678b12bbc0e3 /.gitlab-ci.yml | |
parent | 2c5c7639e59a73f1428fa6fb5dff647234046f59 (diff) | |
download | git-9cdeb34b962d5c1633ac5d23ebba4e24a816242a.tar.gz |
ci: merge scripts which install dependencies
We have two different scripts which install dependencies, one for
dockerized jobs and one for non-dockerized ones. Naturally, these
scripts have quite some duplication. Furthermore, either of these
scripts is missing some test dependencies that the respective other
script has, thus reducing test coverage.
Merge those two scripts such that there is a single source of truth for
test dependencies, only.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3a0ef4d4d4..ba65f50aac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ test:linux: variables: CUSTOM_PATH: "/custom" before_script: - - ./ci/install-docker-dependencies.sh + - ./ci/install-dependencies.sh script: - useradd builder --create-home - chown -R builder "${CI_PROJECT_DIR}" @@ -100,7 +100,7 @@ static-analysis: variables: jobname: StaticAnalysis before_script: - - ./ci/install-docker-dependencies.sh + - ./ci/install-dependencies.sh script: - ./ci/run-static-analysis.sh - ./ci/check-directional-formatting.bash |