Skip to content

Commit 9453588

Browse files
authored
Merge pull request #279 from opf/bump/primer-upstream
Bump/primer upstream 0.41.0
2 parents 2e7e6c6 + aceba0f commit 9453588

File tree

19 files changed

+1329
-908
lines changed

19 files changed

+1329
-908
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@openproject/primer-view-components": minor
3+
---
4+
5+
Clean up warnings when running tests, limit Ruby support to >= 3.2 and Rails support to >= 7.1.

.changeset/popular-eggs-notice.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@openproject/primer-view-components": minor
3+
---
4+
5+
Use auto-check-element v6, which only validates on blur vs. every keystroke.

.github/workflows/add-to-inbox.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
PROJECT_ID: 4503
1313
steps:
1414
- id: get-primer-access-token
15-
uses: actions/create-github-app-token@v1
15+
uses: actions/create-github-app-token@v2
1616
with:
1717
app-id: ${{ vars.PRIMER_ISSUE_TRIAGE_APP_ID }}
1818
private-key: ${{ secrets.PRIMER_ISSUE_TRIAGE_APP_PRIVATE_KEY }}
@@ -22,7 +22,7 @@ jobs:
2222
env:
2323
GH_TOKEN: ${{ steps.get-primer-access-token.outputs.token }}
2424
- id: get-github-access-token
25-
uses: actions/create-github-app-token@v1
25+
uses: actions/create-github-app-token@v2
2626
with:
2727
app-id: ${{ vars.PRIMER_ISSUE_TRIAGE_APP_ID_FOR_GITHUB }}
2828
private-key: ${{ secrets.PRIMER_ISSUE_TRIAGE_APP_PRIVATE_KEY_FOR_GITHUB }}

.github/workflows/lint.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@v4
1717
- name: Get specific changed files
1818
id: changed-files
19-
uses: tj-actions/changed-files@823fcebdb31bb35fdf2229d9f769b400309430d0
19+
uses: tj-actions/changed-files@6cb76d07bee4c9772c6882c06c37837bf82a04d3
2020
with:
2121
files: |
2222
docs/**/*.md
@@ -42,7 +42,7 @@ jobs:
4242
- uses: actions/checkout@v4
4343
- name: Get specific changed files
4444
id: changed-files
45-
uses: tj-actions/changed-files@823fcebdb31bb35fdf2229d9f769b400309430d0
45+
uses: tj-actions/changed-files@6cb76d07bee4c9772c6882c06c37837bf82a04d3
4646
with:
4747
files: |
4848
app/**/*.rb
@@ -62,7 +62,7 @@ jobs:
6262
- uses: actions/checkout@v4
6363
- name: Get changed files
6464
id: changed-files
65-
uses: tj-actions/changed-files@823fcebdb31bb35fdf2229d9f769b400309430d0
65+
uses: tj-actions/changed-files@6cb76d07bee4c9772c6882c06c37837bf82a04d3
6666
with:
6767
files: |
6868
app/components/**/*.erb
@@ -79,7 +79,7 @@ jobs:
7979
- uses: actions/checkout@v4
8080
- name: Get changed files
8181
id: changed-files
82-
uses: tj-actions/changed-files@823fcebdb31bb35fdf2229d9f769b400309430d0
82+
uses: tj-actions/changed-files@6cb76d07bee4c9772c6882c06c37837bf82a04d3
8383
with:
8484
files: |
8585
app/components/**/*.ts
@@ -99,7 +99,7 @@ jobs:
9999
- uses: actions/checkout@v4
100100
- name: Get changed files
101101
id: changed-files
102-
uses: tj-actions/changed-files@823fcebdb31bb35fdf2229d9f769b400309430d0
102+
uses: tj-actions/changed-files@6cb76d07bee4c9772c6882c06c37837bf82a04d3
103103
with:
104104
files: |
105105
app/components/**/*.pcss

.github/workflows/test.yml

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
bundler-cache: true
3939
- uses: actions/setup-node@v4
4040
with:
41-
node-version: 16
41+
node-version: 20
4242
cache: 'npm'
4343
cache-dependency-path: |
4444
package-lock.json
@@ -60,10 +60,6 @@ jobs:
6060
fail-fast: false
6161
matrix:
6262
include:
63-
- rails_version: "6.1.1"
64-
ruby_version: "3.0"
65-
- rails_version: "7.0.3"
66-
ruby_version: "3.0"
6763
- rails_version: "7.1.3"
6864
ruby_version: "3.2"
6965
- rails_version: "7.1.3"
@@ -81,7 +77,7 @@ jobs:
8177
cache-version: ${{ matrix.rails_version }}-${{ matrix.ruby_version }}
8278
- uses: actions/setup-node@v4
8379
with:
84-
node-version: 16
80+
node-version: 20
8581
cache: 'npm'
8682
- name: Build
8783
run: |
@@ -110,10 +106,6 @@ jobs:
110106
fail-fast: false
111107
matrix:
112108
include:
113-
- rails_version: "6.1.1"
114-
ruby_version: "3.0"
115-
- rails_version: "7.0.3"
116-
ruby_version: "3.0"
117109
- rails_version: "7.1.3"
118110
ruby_version: "3.2"
119111
- rails_version: "7.1.3"
@@ -131,7 +123,7 @@ jobs:
131123
cache-version: ${{ matrix.rails_version }}-${{ matrix.ruby_version }}
132124
- uses: actions/setup-node@v4
133125
with:
134-
node-version: 16
126+
node-version: 20
135127
cache: 'npm'
136128
- name: Build
137129
run: |
@@ -156,10 +148,6 @@ jobs:
156148
fail-fast: false
157149
matrix:
158150
include:
159-
- rails_version: "6.1.1"
160-
ruby_version: "3.0"
161-
- rails_version: "7.0.3"
162-
ruby_version: "3.0"
163151
- rails_version: "7.1.3"
164152
ruby_version: "3.2"
165153
- rails_version: "7.1.3"
@@ -199,7 +187,7 @@ jobs:
199187
bundler-cache: true
200188
- uses: actions/setup-node@v4
201189
with:
202-
node-version: 16
190+
node-version: 20
203191
cache: 'npm'
204192
cache-dependency-path: |
205193
package-lock.json
@@ -222,7 +210,7 @@ jobs:
222210
bundler-cache: true
223211
- uses: actions/setup-node@v4
224212
with:
225-
node-version: 16
213+
node-version: 20
226214
cache: 'npm'
227215
cache-dependency-path: |
228216
package-lock.json
@@ -247,7 +235,7 @@ jobs:
247235
bundler-cache: true
248236
- uses: actions/setup-node@v4
249237
with:
250-
node-version: 16
238+
node-version: 20
251239
cache: 'npm'
252240
cache-dependency-path: |
253241
package-lock.json
@@ -314,7 +302,7 @@ jobs:
314302
- name: Setup Node
315303
uses: actions/setup-node@v4
316304
with:
317-
node-version: 16
305+
node-version: 20
318306
cache: 'npm'
319307
- name: NPM Build
320308
run: npm ci

Gemfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source "https://rubygems.org"
44

55
gemspec
6-
rails_version = (ENV["RAILS_VERSION"] || "7.1.3.2").to_s
6+
rails_version = (ENV["RAILS_VERSION"] || "8.0.2").to_s
77

88
gem "rack-cors"
99
gem "rake", "~> 13.2"
@@ -33,7 +33,7 @@ gem "puma", "~> 6.4.2"
3333
# Reduces boot times through caching; required in config/boot.rb
3434
gem "bootsnap", ">= 1.4.2", require: false
3535

36-
gem "lookbook", "~> 2.3.5" unless rails_version.to_f < 7
36+
gem "lookbook", "~> 2.3.8"
3737
gem "view_component", path: ENV["VIEW_COMPONENT_PATH"] if ENV["VIEW_COMPONENT_PATH"]
3838

3939
gem "kramdown", "~> 2.4"
@@ -49,7 +49,8 @@ end
4949
# development dependencies
5050
group :development do
5151
gem "allocation_stats", "~> 0.1"
52-
gem "benchmark-ips", "~> 2.13.0"
52+
gem "benchmark"
53+
gem "benchmark-ips", "~> 2"
5354
gem "capybara", "~> 3.40.0"
5455
gem "cuprite", "~> 0.15"
5556
gem "debug"
@@ -58,7 +59,6 @@ group :development do
5859
gem "listen", "~> 3.9"
5960
gem "matrix", "~> 0.4.2"
6061
gem "mocha"
61-
gem "pry"
6262
gem "rubocop"
6363
gem "rubocop-github", "~> 0.20.0"
6464
gem "rubocop-performance"
@@ -71,5 +71,5 @@ group :development do
7171
gem "sprockets-rails"
7272
gem "thor"
7373
gem "timecop"
74-
gem "yard", "~> 0.9.36"
74+
gem "yard", "~> 0.9.37"
7575
end

0 commit comments

Comments
 (0)