diff options
| author | James Fargher <proglottis@gmail.com> | 2021-07-29 02:29:16 +0300 |
|---|---|---|
| committer | James Fargher <proglottis@gmail.com> | 2021-07-29 02:29:16 +0300 |
| commit | c9916d70c695bb7e812fad646ec0146d61448410 (patch) | |
| tree | b63eff8f5eafd73d27ee3fa6fca45ee17bf09af9 | |
| parent | 21ea470ba6370188bc16be618cc3543cc51ad10c (diff) | |
| parent | 4f536420e3787a138928438d500c15399d5245e9 (diff) | |
Merge branch '3715-ruby3-build' into 'master'
Add Ruby 3 based test job
Closes #3715
See merge request gitlab-org/gitaly!3702
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | Makefile | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 63c6af985..04ecf435b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -120,6 +120,7 @@ build: matrix: - GO_VERSION: [ "1.15", "1.16" ] GIT_VERSION: [ "v2.31.1", "v2.32.0" ] + RUBY_VERSION: [ "2.7", "3.0" ] binaries: <<: *cache_definition @@ -164,6 +165,8 @@ test: - GO_VERSION: [ "1.15", "1.16" ] GIT_VERSION: [ "v2.31.1", "v2.32.0" ] TARGET: test + - RUBY_VERSION: "3.0" + TARGET: test - GO_VERSION: "1.16" GIT_VERSION: "v2.32.0" TARGET: [ test-with-proxies, test-with-praefect, race-go ] @@ -256,7 +256,10 @@ prepare-test-repos: ${TEST_REPO} ${TEST_REPO_GIT} .PHONY: test ## Run Go and Ruby tests. -test: test-go rspec +test: test-go test-ruby + +.PHONY: test-ruby +test-ruby: prepare-tests rspec .PHONY: test-go ## Run Go tests. |