From 5a50e88de2d74bdf9520bb9d2f83b87d387d95a1 Mon Sep 17 00:00:00 2001 From: Zeger-Jan van de Weg Date: Tue, 16 Apr 2019 15:02:41 +0200 Subject: [PATCH 1/3] Test using Git 2.21 Given Rails doesn't use the Git binary anymore, this shouldn't be a problem. --- .gitlab-ci.yml | 2 +- .gitlab/ci/frontend.gitlab-ci.yml | 4 ++-- .gitlab/ci/rails.gitlab-ci.yml | 2 +- changelogs/unreleased/zj-git-2-21-tests.yml | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 changelogs/unreleased/zj-git-2-21-tests.yml 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 From 0b94b794c663b795aa04dac0c1c83087bef3cfde Mon Sep 17 00:00:00 2001 From: Zeger-Jan van de Weg Date: Tue, 16 Apr 2019 14:08:43 +0000 Subject: [PATCH 2/3] Update source install docs for Git 2.21 --- doc/install/installation.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/install/installation.md b/doc/install/installation.md index 61f544deabe..13efe68ef4e 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -95,7 +95,7 @@ Make sure you have the right version of Git installed: # Install Git sudo apt-get install -y git-core -# Make sure Git is version 2.18.0 or higher +# Make sure Git is version 2.21.0 or higher git --version ``` @@ -110,9 +110,9 @@ sudo apt-get install -y libcurl4-openssl-dev libexpat1-dev gettext libz-dev libs # Download and compile from source cd /tmp -curl --remote-name --location --progress https://www.kernel.org/pub/software/scm/git/git-2.18.0.tar.gz -echo '94faf2c0b02a7920b0b46f4961d8e9cad08e81418614102898a55f980fa3e7e4 git-2.18.0.tar.gz' | shasum -a256 -c - && tar -xzf git-2.18.0.tar.gz -cd git-2.18.0/ +curl --remote-name --location --progress https://www.kernel.org/pub/software/scm/git/git-2.21.0.tar.gz +echo '85eca51c7404da75e353eba587f87fea9481ba41e162206a6f70ad8118147bee' git-2.21.0.tar.gz' | shasum -a256 -c - && tar -xzf git-2.21.0.tar.gz +cd git-2.21.0/ ./configure make prefix=/usr/local all From 98befb5d4057e367df43c2371888fa9edbc1df06 Mon Sep 17 00:00:00 2001 From: Zeger-Jan van de Weg Date: Tue, 16 Apr 2019 14:09:45 +0000 Subject: [PATCH 3/3] Update preflight check to require 2.21 --- lib/system_check/app/git_version_check.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/system_check/app/git_version_check.rb b/lib/system_check/app/git_version_check.rb index 7c3e7759dd0..467711fb74e 100644 --- a/lib/system_check/app/git_version_check.rb +++ b/lib/system_check/app/git_version_check.rb @@ -7,7 +7,7 @@ module SystemCheck set_check_pass -> { "yes (#{self.current_version})" } def self.required_version - @required_version ||= Gitlab::VersionInfo.parse('2.18.0') + @required_version ||= Gitlab::VersionInfo.parse('2.21.0') end def self.current_version