Skip to content

Commit ddebde9

Browse files
authored
chore(deps): Upgrade Ruby version to 3.1.4 (vectordotdev#17722)
Seems to remove flakiness from component docs check so I removed the retry. I manually verified the other Ruby scripts still run on Ruby 3. I added a `.ruby-version` file to ensure CI and local Ruby use uses the same version. 3.1.4 should already be installed on the runner image per https://github.com/actions/runner-images/blob/ubuntu20/20230611.1/images/linux/Ubuntu2004-Readme.md. Signed-off-by: Jesse Szwedko <[email protected]> --------- Signed-off-by: Jesse Szwedko <[email protected]>
1 parent e8e7e04 commit ddebde9

File tree

5 files changed

+6
-12
lines changed

5 files changed

+6
-12
lines changed

.github/workflows/test.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ jobs:
8989
# check-version needs tags
9090
fetch-depth: 0 # fetch everything
9191
- run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
92+
- uses: ruby/setup-ruby@v1
9293
- run: bash scripts/environment/prepare.sh
9394
- uses: actions/cache@v3
9495
name: Cache Cargo registry + index
@@ -129,11 +130,7 @@ jobs:
129130
run: make check-markdown
130131
- name: Check Component Docs
131132
if: needs.changes.outputs.source == 'true' || needs.changes.outputs.component_docs == 'true'
132-
uses: nick-fields/retry@v2
133-
with:
134-
max_attempts: 10
135-
timeout_seconds: 900
136-
command: make check-component-docs
133+
run: make check-component-docs
137134
- name: Check Rust Docs
138135
if: needs.changes.outputs.source == 'true'
139136
run: cd rust-doc && make docs

.ruby-version

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.1.4

scripts/Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ruby '~> 2.7.0'
1+
ruby '~> 3.1.0'
22

33
# !!!
44
# Please try not to add more dependencies here.

scripts/Gemfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ DEPENDENCIES
3030
toml-rb (~> 2.0)
3131

3232
RUBY VERSION
33-
ruby 2.7.1p83
33+
ruby 3.1.4p223
3434

3535
BUNDLED WITH
36-
2.1.4
36+
2.4.14

scripts/environment/prepare.sh

-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ if ! rust-license-tool --help >& /dev/null ; then
2121
cargo install --git https://github.com/DataDog/rust-license-tool
2222
fi
2323

24-
cd scripts
25-
bundle install
26-
cd ..
27-
2824
# Currently fixing this to version 0.30 since version 0.31 has introduced
2925
# a change that means it only works with versions of node > 10.
3026
# https://github.com/igorshubovych/markdownlint-cli/issues/258

0 commit comments

Comments
 (0)