Skip to content

Commit c20e884

Browse files
authored
Merge pull request #2675 from ViewComponent/bundle-update
bundle update
2 parents e68585c + d90d86f commit c20e884

7 files changed

Lines changed: 208 additions & 212 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
env:
1717
BUNDLE_GEMFILE: gemfiles/rails_8.1.gemfile
1818
steps:
19-
- uses: actions/checkout@v4.1.1
19+
- uses: actions/checkout@v5
2020
- name: Setup Ruby
2121
uses: ruby/setup-ruby@v1
2222
with:
@@ -49,7 +49,7 @@ jobs:
4949
env:
5050
BUNDLE_GEMFILE: gemfiles/rails_${{ matrix.rails_version }}.gemfile
5151
steps:
52-
- uses: actions/checkout@v4.1.1
52+
- uses: actions/checkout@v5
5353
- name: Setup Ruby
5454
uses: ruby/setup-ruby@v1
5555
with:
@@ -63,7 +63,7 @@ jobs:
6363
RAILS_VERSION: ${{ matrix.rails_version }}
6464
RUBY_VERSION: ${{ matrix.ruby_version }}
6565
- name: Upload coverage results
66-
uses: actions/upload-artifact@v4.4.0
66+
uses: actions/upload-artifact@v5
6767
if: always()
6868
with:
6969
name: simplecov-resultset-rails${{matrix.rails_version}}-ruby${{matrix.ruby_version}}-${{matrix.mode}}
@@ -73,12 +73,12 @@ jobs:
7373
name: Test compatibility with Primer ViewComponents (main)
7474
runs-on: ubuntu-latest
7575
steps:
76-
- uses: actions/checkout@v4.1.1
76+
- uses: actions/checkout@v5
7777
with:
7878
repository: 'primer/view_components'
7979
path: 'primer_view_components'
8080
ref: 'main'
81-
- uses: actions/checkout@v4.1.1
81+
- uses: actions/checkout@v5
8282
with:
8383
path: 'view_component'
8484
- name: Setup Ruby
@@ -87,7 +87,7 @@ jobs:
8787
ruby-version: 4.0
8888
bundler-cache: true
8989
working-directory: 'view_component'
90-
- uses: actions/setup-node@v4
90+
- uses: actions/setup-node@v5
9191
with:
9292
node-version: 20
9393
cache: 'npm'
@@ -106,14 +106,14 @@ jobs:
106106
needs: test
107107
runs-on: ubuntu-latest
108108
steps:
109-
- uses: actions/checkout@v4.1.1
109+
- uses: actions/checkout@v5
110110
- name: Setup Ruby
111111
uses: ruby/setup-ruby@v1
112112
with:
113113
ruby-version: 4.0
114114
bundler-cache: true
115115
- name: Download coverage results
116-
uses: actions/download-artifact@v4.3.0
116+
uses: actions/download-artifact@v5
117117
- name: Collate simplecov
118118
run: |
119119
bundle exec rake coverage:report

‎.github/workflows/lint.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v5
1414
- name: Check for trailing whitespace
1515
uses: raisedevs/find-trailing-whitespace@restrict-to-plaintext-only
1616
- name: Check for merge conflicts
@@ -24,15 +24,15 @@ jobs:
2424
runs-on: ubuntu-latest
2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@v4
27+
uses: actions/checkout@v5
2828
- name: Vale
2929
uses: errata-ai/vale-action@d89dee975228ae261d22c15adcd03578634d429c
3030
env:
3131
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
3232
markdown:
3333
runs-on: ubuntu-latest
3434
steps:
35-
- uses: actions/checkout@master
35+
- uses: actions/checkout@v5
3636
- uses: avto-dev/markdown-lint@v1
3737
with:
3838
config: '.github/lint/markdown.json'
@@ -46,7 +46,7 @@ jobs:
4646
steps:
4747
# Make sure we have some code to diff.
4848
- name: Checkout repository
49-
uses: actions/checkout@v4
49+
uses: actions/checkout@v5
5050
with:
5151
fetch-depth: 0
5252
- name: Get changed files
@@ -74,12 +74,12 @@ jobs:
7474
lint:
7575
runs-on: ubuntu-latest
7676
steps:
77-
- uses: actions/checkout@master
77+
- uses: actions/checkout@v5
7878
- name: Setup Ruby
7979
uses: ruby/setup-ruby@v1
8080
with:
8181
ruby-version: 4.0
82-
- uses: actions/cache@v4
82+
- uses: actions/cache@v5
8383
with:
8484
path: vendor/bundle
8585
key: gems-build-rails-8-ruby-3.2-${{ hashFiles('**/Gemfile.lock') }}
@@ -94,7 +94,7 @@ jobs:
9494
yard-lint:
9595
runs-on: ubuntu-latest
9696
steps:
97-
- uses: actions/checkout@v4
97+
- uses: actions/checkout@v5
9898
with:
9999
fetch-depth: 0
100100
- name: Setup Ruby
@@ -107,7 +107,7 @@ jobs:
107107
audition:
108108
runs-on: ubuntu-latest
109109
steps:
110-
- uses: actions/checkout@v4
110+
- uses: actions/checkout@v5
111111
- name: Setup Ruby
112112
uses: ruby/setup-ruby@v1
113113
with:

‎.github/workflows/push_gem.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
with:
2828
egress-policy: audit
2929

30-
- uses: actions/checkout@v4
30+
- uses: actions/checkout@v5
3131
- name: Set up Ruby
3232
uses: ruby/setup-ruby@v1
3333
with:

‎Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ group :development, :test do
3434
gem "rake", "~> 13"
3535
gem "rails-dom-testing", "~> 2.3.0"
3636
gem "reactionview"
37-
gem "redis"
37+
gem "redis", ">= 4", "< 6"
3838
gem "rspec-rails"
3939
gem "rubocop-md", "~> 2"
4040
gem "selenium-webdriver", "~> 4"

0 commit comments

Comments
 (0)