diff options
| author | Marcel Amirault <mamirault@gitlab.com> | 2023-01-31 03:21:38 +0300 |
|---|---|---|
| committer | Marcel Amirault <mamirault@gitlab.com> | 2023-01-31 03:21:38 +0300 |
| commit | 3ea008cee917bc67bc324e1ec292f861455bf5f6 (patch) | |
| tree | 296436bc2846a33207dd5dfc2ef9089bccdeaaad | |
| parent | 869cfc5d7ed95202e6290d92312cd86c40a55447 (diff) | |
| parent | e12f1b15ab0280fada1949e7d97141425e6ffd42 (diff) | |
Merge branch 'eread/use-new-ruby_3_0_5-based-docker-images' into 'main'
Use new Ruby 3.0.5-based Docker images
See merge request https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests/3490
Merged-by: Marcel Amirault <mamirault@gitlab.com>
Co-authored-by: Evan Read <eread@gitlab.com>
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab/ci/test.gitlab-ci.yml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 911c50b9..1009bbcd 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -3,7 +3,7 @@ ############################################### default: - image: registry.gitlab.com/gitlab-org/gitlab-docs/base:alpine-3.16-ruby-2.7.6-0088e238 + image: registry.gitlab.com/gitlab-org/gitlab-docs/base:alpine-3.16-ruby-3.0.5-869cfc5d tags: - gitlab-org diff --git a/.gitlab/ci/test.gitlab-ci.yml b/.gitlab/ci/test.gitlab-ci.yml index 5ffb3c6e..54ff06bd 100644 --- a/.gitlab/ci/test.gitlab-ci.yml +++ b/.gitlab/ci/test.gitlab-ci.yml @@ -6,7 +6,7 @@ # Test the links in the global nav for all MRs in `gitlab-docs` # test_global_nav_links: - image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.16-ruby-2.7.7-8ae1f7da + image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.16-ruby-3.0.5-869cfc5d extends: - .rules_global_nav_test - .bundle @@ -157,7 +157,7 @@ test_EOL_whitespace: - .rules_chores - .bundle stage: test - image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.16-ruby-2.7.7-8ae1f7da + image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.16-ruby-3.0.5-869cfc5d needs: [] before_script: [] dependencies: [] @@ -173,7 +173,7 @@ test_unlinked_images: - .rules_chores - .bundle stage: test - image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.16-ruby-2.7.7-8ae1f7da + image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.16-ruby-3.0.5-869cfc5d needs: [] before_script: [] dependencies: [] |