diff options
| author | Stan Hu <stanhu@gmail.com> | 2023-01-11 06:02:16 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2023-01-11 06:02:16 +0000 |
| commit | c5b3accf0a8b2008137a90d40cfd65ba3ef2c99a (patch) | |
| tree | bcfc268c567f4b0a5e0598db957f302349d6d02b | |
| parent | 977a7e80f03db2d2e2646abfc6ad9d95bfc71fb9 (diff) | |
| parent | e18740302c1dfb57ed4c3b6eca4a6e958252e72f (diff) | |
| download | gitlab-shell-c5b3accf0a8b2008137a90d40cfd65ba3ef2c99a.tar.gz | |
Merge branch '605-upgrade-to-ruby-3-x' into 'main'
Resolve "Upgrade to Ruby 3.x"
Closes #605
See merge request https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/706
Merged-by: Stan Hu <stanhu@gmail.com>
Approved-by: James Fargher <proglottis@gmail.com>
Approved-by: Stan Hu <stanhu@gmail.com>
Reviewed-by: Ash McKenzie <amckenzie@gitlab.com>
Co-authored-by: Ash McKenzie <amckenzie@gitlab.com>
| -rw-r--r-- | .gitlab-ci.yml | 13 | ||||
| -rw-r--r-- | .ruby-version | 2 | ||||
| -rw-r--r-- | .tool-versions | 2 | ||||
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 2 |
5 files changed, 12 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index de0975c..f06353e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,9 +10,9 @@ include: variables: DOCKER_VERSION: "20.10.15" BUNDLE_FROZEN: "true" - GO_VERSION: "1.18" + GO_VERSION: "golang-1.18" DEBIAN_VERSION: "bullseye" - RUBY_VERSION: "2.7" + RUBY_VERSION: "ruby-2.7" workflow: rules: &workflow_rules @@ -24,7 +24,7 @@ workflow: - if: '$CI_COMMIT_TAG' default: - image: registry.gitlab.com/gitlab-org/gitlab-build-images/debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}-golang-${GO_VERSION}:git-2.36 + image: registry.gitlab.com/gitlab-org/gitlab-build-images/debian-${DEBIAN_VERSION}-${RUBY_VERSION}-${GO_VERSION}:git-2.36 tags: - gitlab-org @@ -51,14 +51,15 @@ default: # Disable the hooks so we don't have to stub the GitLab API command: ["bash", "-c", "mkdir -p /home/git/repositories && rm -rf /srv/gitlab-shell/hooks/* && exec /usr/bin/env GITALY_TESTING_NO_GIT_HOOKS=1 /scripts/process-wrapper"] alias: gitaly - script: - - make verify test tests: extends: .test parallel: matrix: - - GO_VERSION: ["1.17", "1.18", "1.19"] + - GO_VERSION: ["golang-1.17", "golang-1.18", "golang-1.19"] + - RUBY_VERSION: ["ruby-2.7", "ruby-3.0"] + script: + - make verify test after_script: - make coverage coverage: '/\d+.\d+%/' diff --git a/.ruby-version b/.ruby-version index 1f7da99..eca690e 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.7 +3.0.5 diff --git a/.tool-versions b/.tool-versions index 3282e48..193578e 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1,2 @@ -ruby 2.7.7 +ruby 3.0.5 golang 1.18.7 @@ -2,6 +2,7 @@ source 'https://rubygems.org' group :development, :test do gem 'rspec', '~> 3.8.0' + gem 'webrick', '~> 1.7' end group :development, :danger do diff --git a/Gemfile.lock b/Gemfile.lock index e52d244..8a783a2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -104,6 +104,7 @@ GEM terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) unicode-display_width (2.2.0) + webrick (1.7.0) PLATFORMS ruby @@ -111,6 +112,7 @@ PLATFORMS DEPENDENCIES gitlab-dangerfiles (~> 3.5.1) rspec (~> 3.8.0) + webrick (~> 1.7) BUNDLED WITH 2.3.15 |