diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-12-08 12:12:27 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-12-08 12:12:27 +0300 |
| commit | b5a73821fbcefa85f0bdc44af30960693e5f9c0b (patch) | |
| tree | ad978ce34014c6cdff2384077112c97c5911bb49 | |
| parent | 8c9c3cd4c241e9dcb609f73caf90d179f12c8b44 (diff) | |
ci: Drop reporting of Git version
In many of our jobs, we execute `git version` to report the version of
Git that was in use. In some of our jobs this is misleading though given
that we report the system-installed version of Git, which is not the one
that's used to execute our tests. And in other cases it's broken because
we execute the self-built version before calling `make git`, which only
works if we've been able to restore the cache containing this binary.
Remove reporting of the Git version altogether. We can derive which Git
version is in use by checking `GIT_VERSION` and our Makefile. While at
it, fix the logic which tries to delete our Git installation when
testing bundled Git in case the installation doesn't exist.
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index af524ceb7..57f880e3f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,7 +52,6 @@ include: POSTGRES_HOST_AUTH_METHOD: trust before_script: &test_before_script - go version - - git version - while ! psql -h $PGHOST -U $PGUSER -c 'SELECT 1' > /dev/null; do echo "awaiting Postgres service to be ready..." && sleep 1 ; done && echo "Postgres service is ready!" artifacts: paths: @@ -126,7 +125,6 @@ build:binaries: test: <<: *test_definition script: - - _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. @@ -135,7 +133,7 @@ test: # installation around. Otherwise, Git would be able to resolve its binaries # by just looking at its own GIT_PREFIX and then pick binaries from that # installation directory. - - if test -n "${WITH_BUNDLED_GIT}"; then rm -r _build/deps/git/install; fi + - if test -n "${WITH_BUNDLED_GIT}"; then rm -rf _build/deps/git/install; fi - make ${TARGET} parallel: matrix: |