diff options
| author | Andrew Newdigate <andrew@gitlab.com> | 2017-12-14 14:35:53 +0300 |
|---|---|---|
| committer | Andrew Newdigate <andrew@gitlab.com> | 2017-12-14 14:35:53 +0300 |
| commit | ced5ca6eb8654662045f84cef17d66ff68006b8f (patch) | |
| tree | 7b779a2e1e2e7d7db17704f92654caa2fe265ea3 | |
| parent | ef268a9fad9fc7a1ee12e8672bf04f7f990fc5b5 (diff) | |
| parent | 354db2850d26c659f66fc63de013c22e016bc3f8 (diff) | |
Merge branch 'git-2.14' into 'master'
Add git 2.14 to the test matrix
See merge request gitlab-org/gitaly!483
| -rw-r--r-- | .gitlab-ci.yml | 5 | ||||
| -rw-r--r-- | _support/build-images/ruby-2.3-golang-1.8-git-2.14/Dockerfile | 10 |
2 files changed, 15 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 739dab504..36bb7fd80 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,6 +48,10 @@ test:go1.8-git2.8: <<: *test_definition image: registry.gitlab.com/gitlab-org/gitaly/build-ruby-2.3-golang-1.8-git-2.8:latest +test:go1.8-git2.14: + <<: *test_definition + image: registry.gitlab.com/gitlab-org/gitaly/build-ruby-2.3-golang-1.8-git-2.14:latest + cover: stage: test script: @@ -92,6 +96,7 @@ codequality: ruby-2.3-golang-1.8-git-2.8: *build_image ruby-2.3-golang-1.8-git-2.13: *build_image +ruby-2.3-golang-1.8-git-2.14: *build_image # Create a MR in GitLab-CE when releasing a Gitaly version update-downstream-server-version: diff --git a/_support/build-images/ruby-2.3-golang-1.8-git-2.14/Dockerfile b/_support/build-images/ruby-2.3-golang-1.8-git-2.14/Dockerfile new file mode 100644 index 000000000..2844a8a07 --- /dev/null +++ b/_support/build-images/ruby-2.3-golang-1.8-git-2.14/Dockerfile @@ -0,0 +1,10 @@ +FROM registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.8-git-2.14 + +RUN mkdir -p /bundle-cache + +COPY Gemfile /bundle-cache +COPY Gemfile.lock /bundle-cache + +RUN apt-get update -qq && \ + apt-get install -qq -y rubygems bundler cmake build-essential libicu-dev && \ + cd /bundle-cache && bundle install --path vendor/bundle |