Skip to content

Commit cce6e2a

Browse files
committed
Merge tag 'v2.27.1' into release/opensource
2.27.1
2 parents 4bcfb9f + c2424d7 commit cce6e2a

File tree

15 files changed

+119
-21
lines changed

15 files changed

+119
-21
lines changed
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: 'Check Auto Merge Status'
2+
description: 'checks if baseline VRTs can be auto-merged using the github variable from the repo'
3+
4+
inputs:
5+
auto-accept-branches:
6+
description: 'Branches where baselines can be automerged'
7+
required: true
8+
9+
outputs:
10+
result:
11+
description: 'Returns a boolean when changes if the baselines can be automerged'
12+
value: ${{ steps.check-automerge-status.outputs.result }}
13+
14+
runs:
15+
using: 'composite'
16+
steps:
17+
- name: Check if baseline can be auto merged
18+
id: check-automerge-status
19+
run: |
20+
# get the allowed branches and split using a comma
21+
allowed_branches=$(echo ${{ inputs.auto-accept-branches }} | tr ',' '\n')
22+
echo "allowed branches : $allowed_branches"
23+
current_branch=${{ github.ref }}
24+
echo "current branches : $current_branch"
25+
26+
allow_automerge=false
27+
28+
# regex for dse-internal develop branches
29+
branch_pattern='^([1-9]|[1-9][02468])-(summer|winter|spring)-[0-9]{2}$'
30+
31+
# check if event type is push & check if its allowed in the github variable
32+
echo "Github Event Name : ${{ github.event_name }}"
33+
if [ "${{ github.event_name }}" == "push" ]; then
34+
for branch in $allowed_branches; do
35+
if [[ "$current_branch" == "refs/heads/$branch" ]]; then
36+
echo "baselines can be auto-merged"
37+
allow_automerge=true
38+
break
39+
fi
40+
done
41+
42+
# check branch_pattern regex
43+
if [[ "$allow_automerge" == "false" && "$current_branch" =~ $branch_pattern ]]; then
44+
echo "Branch matches regex pattern: $current_branch"
45+
allow_automerge=true
46+
fi
47+
fi
48+
49+
# set the output value
50+
echo "final value for auto-accept: $allow_automerge"
51+
echo "result=$allow_automerge" >> $GITHUB_OUTPUT
52+
shell: bash

.github/workflows/remove-labels.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,4 @@ jobs:
1010
- uses: actions-ecosystem/action-remove-labels@v1
1111
with:
1212
labels: |
13-
vrt:chrome-ready
14-
vrt:mobile-ready
15-
vrt:full-ready
13+
vrt:chromatic

.github/workflows/vrt.yml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,19 @@ name: VRT Triggered from Label
33
on:
44
pull_request:
55
types: [labeled]
6+
push:
7+
branches: ["2[0-9][02468]-*-2[0-9]"]
68

79
env:
810
CHROMATIC_PROJECT_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN_DSE }}
911

1012
jobs:
1113
vrt-storybook-prepare:
12-
if: startsWith(github.event.label.name, 'vrt:')
14+
if: |
15+
startsWith(github.event.label.name, 'vrt:') || github.event_name == 'push'
1316
runs-on: salesforce-ux-emu-Ubuntu
17+
outputs:
18+
auto-accept-changes: ${{ steps.check-auto-accept-status.outputs.result }}
1419
steps:
1520
- uses: actions/checkout@v3
1621

@@ -42,6 +47,12 @@ jobs:
4247
name: storybook-build-for-chromatic
4348
path: workspace/storybook.tar.gz
4449

50+
- name: Check if chromatic baselines should be auto-accepted
51+
id: check-auto-accept-status
52+
uses: ./.github/actions/baseline-auto-accept-checks
53+
with:
54+
auto-accept-branches: ${{ vars.AUTO_BASELINE_ACCEPT_BRANCHES }}
55+
4556
vrt-chromatic:
4657
# if: ${{ (1 < 0) }}
4758
runs-on: salesforce-ux-emu-Ubuntu
@@ -69,20 +80,20 @@ jobs:
6980
working-directory: workspace
7081
run: tar -xvf storybook.tar.gz
7182

72-
- name: Publish dse-system-internal to chromatic
83+
- name: Publish dse-system-internal to chromatic #turbo snapshots disabled
7384
id: chromatic
7485
uses: chromaui/action@v10
7586
with:
7687
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN_DSE }}
7788
storybookBuildDir: workspace/.www
7889
exitZeroOnChanges: true
7990
exitOnceUploaded: true
80-
onlyChanged: true
81-
traceChanged: true
91+
autoAcceptChanges: ${{ needs.vrt-storybook-prepare.outputs.auto-accept-changes }}
8292

8393
- name: Find Chromatic Comment
8494
uses: salesforce-ux-emu/[email protected]
8595
id: find-chromatic-comment
96+
if: needs.vrt-storybook-prepare.outputs.auto-accept-changes == 'false'
8697
with:
8798
issue-number: ${{ github.event.pull_request.number }}
8899
comment-author: "github-actions[bot]"
@@ -91,6 +102,7 @@ jobs:
91102
- name: Publish Chromatic results to GitHub
92103
uses: salesforce-ux-emu/[email protected]
93104
id: post-chromatic-comment
105+
if: needs.vrt-storybook-prepare.outputs.auto-accept-changes == 'false'
94106
with:
95107
comment-id: ${{ steps.find-chromatic-comment.outputs.comment-id }}
96108
issue-number: ${{ github.event.pull_request.number }}

RELEASENOTES.general.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<!-- Release notes authoring guidelines: http://keepachangelog.com/ -->
22
<!-- On release, add general notes here. In time the legacy release notes will be add to this -->
33

4+
5+
## 2.27.1 - May 7, 2025
6+
47
## 2.27.0 - April 17, 2025
58

69
- Update icons to `v10.12.2`

RELEASENOTES.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
<!-- Release notes authoring guidelines: http://keepachangelog.com/ -->
22
<!-- !!! THIS FILE IS AUTO-GENERATED !!! DO NOT EDIT THIS FILE MANUALLY !!! -->
33

4+
## Release 2.27.1 - May 7, 2025
5+
6+
## Component Blueprints
7+
### [Cards](https://www.lightningdesignsystem.com/components/cards)
8+
#### Fixed
9+
- Add missing `--slds` component hooks fallbacks to match existing `--sds` hooks
10+
11+
### [Checkbox Toggle](https://www.lightningdesignsystem.com/components/checkbox-toggle)
12+
#### Fixed
13+
- Add missing `--slds` component hooks fallbacks to match existing `--sds` hooks
14+
15+
### [Tabs](https://www.lightningdesignsystem.com/components/tabs)
16+
#### Fixed
17+
- Add missing `--slds` component hooks fallbacks to match existing `--sds` hooks
18+
419
## Release 2.27.0 - April 17, 2025
520

621
- Update icons to `v10.12.2`

app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"url": "https://github.com/salesforce-ux/heroku-buildpack-nginx.git#dse"
1111
}
1212
],
13-
"stack": "heroku-22",
13+
"stack": "heroku-24",
1414
"environments": {
1515
"review": {
1616
"buildpacks": [

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"CSS"
99
],
1010
"homepage": "https://lightningdesignsystem.com",
11-
"version": "2.27.0",
11+
"version": "2.27.1",
1212
"author": "Salesforce",
1313
"bugs": {
1414
"url": "https://github.com/salesforce-ux/design-system/issues"

ui/_config.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
///
1010
/// @type String
1111
/// @access private
12-
$app-version: "2.27.0";
12+
$app-version: "2.27.1";
1313

1414
/// Debug mode (uncomment to activate)
1515
/// Turn on to output deprecation warnings during development

ui/components/cards/RELEASENOTES.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44

55
<!-- ## [Unreleased] -->
66

7+
## 2.27.1
8+
9+
### Fixed
10+
11+
- Add missing `--slds` component hooks fallbacks to match existing `--sds` hooks
12+
713
## 2.17.1
814

915
### Changed

0 commit comments

Comments
 (0)