Skip to content

Commit

Permalink
Merge remote-tracking branches 'origin/dependabot/bundler/bundler-dep…
Browse files Browse the repository at this point in the history
…s-1f0fbb5402', 'origin/dependabot/github_actions/gha-deps-4049d8e0f8' and 'origin/dependabot/npm_and_yarn/npm-deps-a2129b841b' into dev/lopopolo-bump
  • Loading branch information
lopopolo committed Dec 8, 2024
4 parents 13ff301 + 5109b63 + 85c7541 + c182c8b commit a51f906
Show file tree
Hide file tree
Showing 11 changed files with 36 additions and 34 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/audit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:

steps:
- name: Checkout repository
uses: actions/[email protected].0
uses: actions/[email protected].2

- name: Install Ruby toolchain
uses: ruby/setup-ruby@c04af2bb7258bb6a03df1d3c1865998ac9390972 # v1.194.0
uses: ruby/setup-ruby@a2bbe5b1b236842c1cb7dd11e8e3b51e0a616acc # v1.202.0
with:
ruby-version: ".ruby-version"
bundler-cache: true
Expand All @@ -41,7 +41,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/[email protected].0
uses: actions/[email protected].2

- name: Install Rust toolchain
uses: artichoke/setup-rust/[email protected]
Expand All @@ -52,7 +52,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
18 changes: 9 additions & 9 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
RUST_BACKTRACE: 1
steps:
- name: Checkout repository
uses: actions/[email protected].0
uses: actions/[email protected].2

- name: Install Rust toolchain
uses: artichoke/setup-rust/[email protected]
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
RUST_BACKTRACE: 1
steps:
- name: Checkout repository
uses: actions/[email protected].0
uses: actions/[email protected].2

- name: Install Rust toolchain
uses: artichoke/setup-rust/[email protected]
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
RUST_BACKTRACE: 1
steps:
- name: Checkout repository
uses: actions/[email protected].0
uses: actions/[email protected].2

- name: Install Rust toolchain
uses: artichoke/setup-rust/[email protected]
Expand Down Expand Up @@ -142,7 +142,7 @@ jobs:
RUST_BACKTRACE: 1
steps:
- name: Checkout repository
uses: actions/[email protected].0
uses: actions/[email protected].2

- name: Install Rust toolchain
uses: artichoke/setup-rust/[email protected]
Expand All @@ -163,7 +163,7 @@ jobs:
RUST_BACKTRACE: 1
steps:
- name: Checkout repository
uses: actions/[email protected].0
uses: actions/[email protected].2

- name: Install Rust toolchain
uses: artichoke/setup-rust/[email protected]
Expand All @@ -186,10 +186,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/[email protected].0
uses: actions/[email protected].2

- name: Install Ruby toolchain
uses: ruby/setup-ruby@c04af2bb7258bb6a03df1d3c1865998ac9390972 # v1.194.0
uses: ruby/setup-ruby@a2bbe5b1b236842c1cb7dd11e8e3b51e0a616acc # v1.202.0
with:
ruby-version: ".ruby-version"
bundler-cache: true
Expand All @@ -202,10 +202,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/[email protected].0
uses: actions/[email protected].2

- name: Setup Node.js runtime
uses: actions/setup-node@v4.0.4
uses: actions/setup-node@v4.1.0
with:
node-version: "lts/*"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/code-coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
steps:
- name: Checkout repository
uses: actions/[email protected].0
uses: actions/[email protected].2

- name: Install nightly Rust toolchain
uses: artichoke/setup-rust/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/markdown-link-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/[email protected].0
uses: actions/[email protected].2

- name: Check for broken links in markdown files
uses: gaurav-nelson/github-action-markdown-link-check@d53a906aa6b22b8979d33bc86170567e619495ec # v1.0.15
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/miri.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/[email protected].0
uses: actions/[email protected].2

- name: Install Rust toolchain
uses: artichoke/setup-rust/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/repo-labels.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ jobs:
name: Synchronize repository labels
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].2

- name: Sync GitHub Issue Labels
uses: crazy-max/ghaction-github-labeler@de749cf181958193cb7debf1a9c5bb28922f3e1b # v5.0.0
uses: crazy-max/ghaction-github-labeler@b54af0c25861143e7c8813d7cbbf46d2c341680c # v5.1.0
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
yaml-file: .github/labels.yaml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rustdoc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/[email protected].0
uses: actions/[email protected].2

- name: Install Rust toolchain
uses: artichoke/setup-rust/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ source 'https://rubygems.org'

gem 'bundler-audit', '~> 0.9', require: false
gem 'rake', '>= 12.3.3', require: false
gem 'rubocop', '~> 1.66', require: false
gem 'rubocop', '~> 1.69', require: false
gem 'rubocop-rake', '~> 0.6', require: false
20 changes: 11 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,41 +5,43 @@ GEM
bundler-audit (0.9.2)
bundler (>= 1.2.0, < 3)
thor (~> 1.0)
json (2.7.2)
json (2.8.2)
language_server-protocol (3.17.0.3)
parallel (1.26.3)
parser (3.3.5.0)
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.66.1)
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.32.3)
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)
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.66)
rubocop (~> 1.69)
rubocop-rake (~> 0.6)

BUNDLED WITH
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"homepage": "https://www.artichokeruby.org",
"bugs": "https://github.com/artichoke/intaglio/issues",
"devDependencies": {
"prettier": "^3.2.5"
"prettier": "^3.4.1"
},
"scripts": {
"fmt": "prettier --write \"**/*\""
Expand Down

0 comments on commit a51f906

Please sign in to comment.