Skip to content

Commit 9dd40d7

Browse files
committed
Merge branch 'bump/primer-upstream-ref' into bump/primer-upstream
2 parents 71ba4de + 27d23f4 commit 9dd40d7

30 files changed

Lines changed: 134 additions & 86 deletions

File tree

.changeset/cyan-readers-prove.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+
Enable use_experimental_non_local_form for all SelectPanels

.changeset/fruity-rooms-travel.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': patch
3+
---
4+
5+
Updates SelectPanel anchor to allow IconButtons

.changeset/tiny-frogs-pretend.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": patch
3+
---
4+
5+
Remove left/right bg color borders from Avatar Stack

.github/workflows/test.yml

Lines changed: 21 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ jobs:
3434
- uses: actions/checkout@v5
3535
- uses: ruby/setup-ruby@v1
3636
with:
37-
ruby-version: '3.4'
37+
ruby-version: "3.4"
3838
bundler-cache: true
3939
- uses: actions/setup-node@v5
4040
with:
4141
node-version: 20
42-
cache: 'npm'
42+
cache: "npm"
4343
cache-dependency-path: |
4444
package-lock.json
4545
demo/package-lock.json
@@ -50,7 +50,7 @@ jobs:
5050
- name: Test
5151
run: bundle exec rake test:accessibility
5252
components:
53-
name: Components
53+
name: Components (${{ matrix.label }})
5454
runs-on:
5555
labels:
5656
- runs-on
@@ -59,15 +59,7 @@ jobs:
5959
strategy:
6060
fail-fast: false
6161
matrix:
62-
include:
63-
- rails_version: '7.2.2.1'
64-
ruby_version: '3.2'
65-
- rails_version: '7.2.2.1'
66-
ruby_version: '3.3'
67-
- rails_version: 'main'
68-
ruby_version: '3.3'
69-
- rails_version: 'main'
70-
ruby_version: '3.4'
62+
include: ${{ fromJson(vars.TEST_MATRIX) }}
7163
steps:
7264
- uses: actions/checkout@v5
7365
- uses: ruby/setup-ruby@v1
@@ -78,7 +70,7 @@ jobs:
7870
- uses: actions/setup-node@v5
7971
with:
8072
node-version: 20
81-
cache: 'npm'
73+
cache: "npm"
8274
- name: Build
8375
run: |
8476
npm ci
@@ -96,7 +88,7 @@ jobs:
9688
RUBY_VERSION: ${{ matrix.ruby_version }}
9789
RAILS_VERSION: ${{ matrix.rails_version }}
9890
lib:
99-
name: Lib
91+
name: Lib (${{ matrix.label }})
10092
runs-on:
10193
labels:
10294
- runs-on
@@ -105,15 +97,7 @@ jobs:
10597
strategy:
10698
fail-fast: false
10799
matrix:
108-
include:
109-
- rails_version: '7.2.2.1'
110-
ruby_version: '3.2'
111-
- rails_version: '7.2.2.1'
112-
ruby_version: '3.3'
113-
- rails_version: 'main'
114-
ruby_version: '3.3'
115-
- rails_version: 'main'
116-
ruby_version: '3.4'
100+
include: ${{ fromJson(vars.TEST_MATRIX) }}
117101
steps:
118102
- uses: actions/checkout@v5
119103
- uses: ruby/setup-ruby@v1
@@ -124,7 +108,7 @@ jobs:
124108
- uses: actions/setup-node@v5
125109
with:
126110
node-version: 20
127-
cache: 'npm'
111+
cache: "npm"
128112
- name: Build
129113
run: |
130114
npm ci
@@ -142,20 +126,12 @@ jobs:
142126
RUBY_VERSION: ${{ matrix.ruby_version }}
143127
RAILS_VERSION: ${{ matrix.rails_version }}
144128
performance:
145-
name: Performance
129+
name: Performance (${{ matrix.label }})
146130
runs-on: ubuntu-latest
147131
strategy:
148132
fail-fast: false
149133
matrix:
150-
include:
151-
- rails_version: '7.2.2.1'
152-
ruby_version: '3.2'
153-
- rails_version: '7.2.2.1'
154-
ruby_version: '3.3'
155-
- rails_version: 'main'
156-
ruby_version: '3.3'
157-
- rails_version: 'main'
158-
ruby_version: '3.4'
134+
include: ${{ fromJson(vars.TEST_MATRIX) }}
159135
steps:
160136
- uses: actions/checkout@v5
161137
- uses: ruby/setup-ruby@v1
@@ -183,12 +159,12 @@ jobs:
183159
- uses: actions/checkout@v5
184160
- uses: ruby/setup-ruby@v1
185161
with:
186-
ruby-version: '3.2'
162+
ruby-version: "3.2"
187163
bundler-cache: true
188164
- uses: actions/setup-node@v5
189165
with:
190166
node-version: 20
191-
cache: 'npm'
167+
cache: "npm"
192168
cache-dependency-path: |
193169
package-lock.json
194170
demo/package-lock.json
@@ -206,12 +182,12 @@ jobs:
206182
- uses: actions/checkout@v5
207183
- uses: ruby/setup-ruby@v1
208184
with:
209-
ruby-version: '3.2'
185+
ruby-version: "3.2"
210186
bundler-cache: true
211187
- uses: actions/setup-node@v5
212188
with:
213189
node-version: 20
214-
cache: 'npm'
190+
cache: "npm"
215191
cache-dependency-path: |
216192
package-lock.json
217193
demo/package-lock.json
@@ -235,12 +211,12 @@ jobs:
235211
fetch-depth: 0
236212
- uses: ruby/setup-ruby@v1
237213
with:
238-
ruby-version: '3.2'
214+
ruby-version: "3.2"
239215
bundler-cache: true
240216
- uses: actions/setup-node@v5
241217
with:
242218
node-version: 20
243-
cache: 'npm'
219+
cache: "npm"
244220
cache-dependency-path: |
245221
package-lock.json
246222
demo/package-lock.json
@@ -281,7 +257,7 @@ jobs:
281257
commit_message: Generating component snapshots
282258
file_pattern: .playwright/screenshots/**/*.png .playwright/screenshots/**/*.yml
283259
push_options: --force-with-lease
284-
- name: 'Changes detected'
260+
- name: "Changes detected"
285261
if: steps.auto-commit.outputs.changes_detected == 'true'
286262
uses: phulsechinmay/rewritable-pr-comment@v0.3.0
287263
with:
@@ -292,7 +268,7 @@ jobs:
292268
293269
[Review differences](https://github.com/opf/primer_view_components/pull/${{ github.event.number }}/files?file-filters%5B%5D=.png&file-filters%5B%5D=.yml&show-viewed-files=false)
294270
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
295-
COMMENT_IDENTIFIER: 'visual-comparison-diff'
271+
COMMENT_IDENTIFIER: "visual-comparison-diff"
296272
- uses: actions/upload-artifact@v4
297273
with:
298274
name: playwright-report
@@ -314,17 +290,17 @@ jobs:
314290
- name: Setup Ruby
315291
uses: ruby/setup-ruby@v1
316292
with:
317-
ruby-version: '3.2'
293+
ruby-version: "3.2"
318294
bundler-cache: true
319295
- name: Setup Node
320296
uses: actions/setup-node@v5
321297
with:
322298
node-version: 20
323-
cache: 'npm'
299+
cache: "npm"
324300
- name: NPM Build
325301
run: npm ci
326302
env:
327303
# Disable CSS minification for tests
328-
CI: 'false'
304+
CI: "false"
329305
- name: Test CSS
330306
run: bundle exec rake test:component_css
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
- button "Menu" [expanded]
2+
- dialog "Menu":
3+
- heading "Menu" [level=1]
4+
- button "Close"
5+
- text: Filter
6+
- searchbox "Filter"
7+
- listbox "Menu options":
8+
- option "Item 1"
9+
- option "Item 2"
10+
- option "Item 3"
11+
- text: 3 results tab for results
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- button "Menu"
11 KB
Loading
11 KB
Loading
11.7 KB
Loading
10.4 KB
Loading

0 commit comments

Comments
 (0)