diff options
| author | Toon Claes <toon@gitlab.com> | 2023-05-23 11:14:40 +0300 |
|---|---|---|
| committer | Toon Claes <toon@gitlab.com> | 2023-05-23 11:14:40 +0300 |
| commit | 908123117739f917d69dd32c10b5eb0865fe86b0 (patch) | |
| tree | 26c72d8422a6745ccab921cffc9add2e26e86a13 | |
| parent | 75ae93669b6c4899b566c5f598308026e81423a6 (diff) | |
| parent | b7c546cb4d4197c83816e4284e5513327bd745df (diff) | |
Merge branch 'eread/roll-ruby-version-forward-to-3_1_4' into 'master'
Roll version of Ruby in project forward to Ruby 3.1.4 to match GitLab
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5817
Merged-by: Toon Claes <toon@gitlab.com>
Approved-by: Toon Claes <toon@gitlab.com>
Co-authored-by: Evan Read <eread@gitlab.com>
| -rw-r--r-- | .gitlab-ci.yml | 5 | ||||
| -rw-r--r-- | .ruby-version | 2 | ||||
| -rw-r--r-- | .tool-versions | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d2b6ca03a..894f7a0a9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,6 +20,7 @@ variables: # We use Gitaly's Git version by default. GIT_VERSION: "default" GO_VERSION: "1.19" + RUBY_VERSION: "3.1" RUST_VERSION: "1.65" POSTGRES_VERSION: "12-alpine" PGBOUNCER_VERSION: "1.17.0" @@ -440,7 +441,7 @@ secret_detection: build-proto-gem: needs: [] - image: ruby:3.0 + image: ruby:${RUBY_VERSION} stage: publish before_script: [] variables: @@ -457,7 +458,7 @@ build-proto-gem: publish-proto-gem: needs: [] - image: ruby:3.0 + image: ruby:${RUBY_VERSION} stage: publish before_script: [] script: diff --git a/.ruby-version b/.ruby-version index eca690e73..0aec50e6e 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.0.5 +3.1.4 diff --git a/.tool-versions b/.tool-versions index 397916013..d61f5b460 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,4 +1,4 @@ # Versions of Gitaly dependencies managed by asdf. golang 1.19.9 1.18.9 golangci-lint 1.50.1 -ruby 3.0.5 +ruby 3.1.4 |