diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-04-16 15:02:41 +0200 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-04-16 15:11:20 +0200 |
| commit | 5a50e88de2d74bdf9520bb9d2f83b87d387d95a1 (patch) | |
| tree | 20b2c4f51a0069d630a6917de1ed8cef24b60897 | |
| parent | c16619c527afdd00aa4dbbbf7544afb2f38477a8 (diff) | |
| download | gitlab-ce-5a50e88de2d74bdf9520bb9d2f83b87d387d95a1.tar.gz | |
Test using Git 2.21
Given Rails doesn't use the Git binary anymore, this shouldn't be a
problem.
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab/ci/frontend.gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/zj-git-2-21-tests.yml | 5 |
4 files changed, 9 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 72385b93bd9..4d30efccb5c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-golang-1.11-git-2.18-chrome-71.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29" +image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-golang-1.11-git-2.21-chrome-71.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29" variables: MYSQL_ALLOW_EMPTY_PASSWORD: "1" diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index e38b878972d..5acfdb4e832 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -16,7 +16,7 @@ gitlab:assets:compile: <<: *assets-compile-cache extends: .dedicated-no-docs-pull-cache-job - image: dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-git-2.18-chrome-71.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker-18.06.1 + image: dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-git-2.21-chrome-71.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker-18.06.1 dependencies: - setup-test-env services: @@ -234,4 +234,4 @@ jsdoc: name: jsdoc expire_in: 31d paths: - - jsdoc/
\ No newline at end of file + - jsdoc/ diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index b926fb77a08..bdc6ce234b8 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -86,7 +86,7 @@ .rspec-metadata-pg-10: &rspec-metadata-pg-10 <<: *rspec-metadata <<: *use-pg-10 - image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-golang-1.11-git-2.18-chrome-71.0-node-10.x-yarn-1.12-postgresql-10-graphicsmagick-1.3.29" + image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-golang-1.11-git-2.21-chrome-71.0-node-10.x-yarn-1.12-postgresql-10-graphicsmagick-1.3.29" .rspec-metadata-mysql: &rspec-metadata-mysql <<: *rspec-metadata diff --git a/changelogs/unreleased/zj-git-2-21-tests.yml b/changelogs/unreleased/zj-git-2-21-tests.yml new file mode 100644 index 00000000000..56711379368 --- /dev/null +++ b/changelogs/unreleased/zj-git-2-21-tests.yml @@ -0,0 +1,5 @@ +--- +title: Test using Git 2.21 +merge_request: 27418 +author: +type: added |