Skip to content

Commit

Permalink
Merge pull request #1171 from artichoke/dev/lopopolo-fix
Browse files Browse the repository at this point in the history
Upgrade Ruby and Bundler, merge all outstanding dep PRs
  • Loading branch information
lopopolo authored Dec 16, 2024
2 parents ebfd865 + 88834e5 commit 929c0bd
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/audit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
uses: actions/checkout@v4.2.2

- name: Install Ruby toolchain
uses: ruby/setup-ruby@7d3497fd78c07c0d84ebafa58d8dac60cd1f0763 # v1.199.0
uses: ruby/setup-ruby@a2bbe5b1b236842c1cb7dd11e8e3b51e0a616acc # v1.202.0
with:
ruby-version: ".ruby-version"
bundler-cache: true
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
cargo generate-lockfile --verbose
fi
- uses: EmbarkStudios/cargo-deny-action@8371184bd11e21dcf8ac82ebf8c9c9f74ebf7268 # v2.0.1
- uses: EmbarkStudios/cargo-deny-action@2d8c9929d8f9f42bedba73f1287cb0b479f07acb # v2.0.3
with:
arguments: --locked --all-features
command: check ${{ matrix.checks }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
target: "wasm32-unknown-emscripten"

- name: Install Ruby toolchain
uses: ruby/setup-ruby@7d3497fd78c07c0d84ebafa58d8dac60cd1f0763 # v1.199.0
uses: ruby/setup-ruby@a2bbe5b1b236842c1cb7dd11e8e3b51e0a616acc # v1.202.0
with:
ruby-version: ".ruby-version"
bundler-cache: true
Expand Down Expand Up @@ -147,7 +147,7 @@ jobs:
uses: actions/checkout@v4.2.2

- name: Install Ruby toolchain
uses: ruby/setup-ruby@7d3497fd78c07c0d84ebafa58d8dac60cd1f0763 # v1.199.0
uses: ruby/setup-ruby@a2bbe5b1b236842c1cb7dd11e8e3b51e0a616acc # v1.202.0
with:
ruby-version: ".ruby-version"
bundler-cache: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
target: "wasm32-unknown-emscripten"

- name: Install Ruby toolchain
uses: ruby/setup-ruby@7d3497fd78c07c0d84ebafa58d8dac60cd1f0763 # v1.199.0
uses: ruby/setup-ruby@a2bbe5b1b236842c1cb7dd11e8e3b51e0a616acc # v1.202.0
with:
ruby-version: ".ruby-version"
bundler-cache: true
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.3
3.3.6
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ source 'https://rubygems.org'

gem 'bundler-audit', '~> 0.9', require: false
gem 'rake', '>= 12.3.3', require: false
gem 'rubocop', '~> 1.68', require: false
gem 'rubocop', '~> 1.69', require: false
gem 'rubocop-rake', '~> 0.6', require: false
gem 'tomlrb', '~> 2.0', require: false
22 changes: 12 additions & 10 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,44 +5,46 @@ GEM
bundler-audit (0.9.2)
bundler (>= 1.2.0, < 3)
thor (~> 1.0)
json (2.7.5)
json (2.8.2)
language_server-protocol (3.17.0.3)
parallel (1.26.3)
parser (3.3.5.1)
parser (3.3.6.0)
ast (~> 2.4.1)
racc
racc (1.8.1)
rainbow (3.1.1)
rake (13.2.1)
regexp_parser (2.9.2)
rubocop (1.68.0)
regexp_parser (2.9.3)
rubocop (1.69.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 2.4, < 3.0)
rubocop-ast (>= 1.32.2, < 2.0)
rubocop-ast (>= 1.36.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.33.0)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.36.2)
parser (>= 3.3.1.0)
rubocop-rake (0.6.0)
rubocop (~> 1.0)
ruby-progressbar (1.13.0)
thor (1.3.2)
tomlrb (2.0.3)
unicode-display_width (2.6.0)
unicode-display_width (3.1.2)
unicode-emoji (~> 4.0, >= 4.0.4)
unicode-emoji (4.0.4)

PLATFORMS
ruby

DEPENDENCIES
bundler-audit (~> 0.9)
rake (>= 12.3.3)
rubocop (~> 1.68)
rubocop (~> 1.69)
rubocop-rake (~> 0.6)
tomlrb (~> 2.0)

BUNDLED WITH
2.5.15
2.6.0

0 comments on commit 929c0bd

Please sign in to comment.