Skip to content

Commit

Permalink
chore(deps): Upgrade Ruby version to 3.1.4 (#17722)
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
jszwedko authored Jun 21, 2023
1 parent e8e7e04 commit ddebde9
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 12 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ jobs:
# check-version needs tags
fetch-depth: 0 # fetch everything
- run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
- uses: ruby/setup-ruby@v1
- run: bash scripts/environment/prepare.sh
- uses: actions/cache@v3
name: Cache Cargo registry + index
Expand Down Expand Up @@ -129,11 +130,7 @@ jobs:
run: make check-markdown
- name: Check Component Docs
if: needs.changes.outputs.source == 'true' || needs.changes.outputs.component_docs == 'true'
uses: nick-fields/retry@v2
with:
max_attempts: 10
timeout_seconds: 900
command: make check-component-docs
run: make check-component-docs
- name: Check Rust Docs
if: needs.changes.outputs.source == 'true'
run: cd rust-doc && make docs
Expand Down
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.1.4
2 changes: 1 addition & 1 deletion scripts/Gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ruby '~> 2.7.0'
ruby '~> 3.1.0'

# !!!
# Please try not to add more dependencies here.
Expand Down
4 changes: 2 additions & 2 deletions scripts/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ DEPENDENCIES
toml-rb (~> 2.0)

RUBY VERSION
ruby 2.7.1p83
ruby 3.1.4p223

BUNDLED WITH
2.1.4
2.4.14
4 changes: 0 additions & 4 deletions scripts/environment/prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ if ! rust-license-tool --help >& /dev/null ; then
cargo install --git https://github.com/DataDog/rust-license-tool
fi

cd scripts
bundle install
cd ..

# Currently fixing this to version 0.30 since version 0.31 has introduced
# a change that means it only works with versions of node > 10.
# https://github.com/igorshubovych/markdownlint-cli/issues/258
Expand Down

0 comments on commit ddebde9

Please sign in to comment.