-
Notifications
You must be signed in to change notification settings - Fork 30
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2772 from mi6/develop
Develop -> Main
- Loading branch information
Showing
73 changed files
with
3,811 additions
and
1,697 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
name: Cherry pick into v3.0.0/develop | ||
permissions: read-all | ||
|
||
on: | ||
pull_request: | ||
branches: | ||
- develop | ||
types: ["closed"] | ||
|
||
jobs: | ||
cherry_pick_release_v3_0: | ||
runs-on: ubuntu-latest | ||
permissions: | ||
contents: write | ||
pull-requests: write | ||
name: Cherry pick into v3.0.0/develop | ||
if: ${{ github.event.pull_request.merged == true }} | ||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1 | ||
with: | ||
fetch-depth: 0 | ||
- name: Cherry pick into v3.0.0/develop | ||
uses: carloscastrojumo/github-cherry-pick-action@c980652a80bb76d11b6cdc38efb0a5cee28ff4e6 #v1.0.10 | ||
with: | ||
branch: v3.0.0/develop | ||
labels: | | ||
cherry-pick | ||
title: '[v3 cherry-pick] {old_title}' | ||
body: 'Cherry picking #{old_pull_request_id} onto this branch' | ||
env: | ||
GITHUB_TOKEN: ${{ secrets.CHERRY_PAT }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,70 +4,70 @@ | |
"GHSA-pfrx-2q88-qq97": { | ||
"active": true, | ||
"notes": "requires upgrade to [email protected], which is a breaking change", | ||
"expiry": "9 November 2024" | ||
"expiry": "9 December 2024" | ||
} | ||
}, | ||
{ | ||
"GHSA-c2qf-rxjj-qqgw": { | ||
"active": true, | ||
"notes": "requires lerna v7, which is a breaking change", | ||
"expiry": "9 November 2024" | ||
"expiry": "9 December 2024" | ||
} | ||
}, | ||
{ | ||
"GHSA-7fh5-64p2-3v2j": { | ||
"active": true, | ||
"notes": "requires upgrade to postcss v8.4.31, which doesn't align with the version used by @storybook/addon-postcss", | ||
"expiry": "9 November 2024" | ||
"expiry": "9 December 2024" | ||
} | ||
}, | ||
{ | ||
"GHSA-f5x3-32g6-xq36": { | ||
"active": true, | ||
"notes": "issue in 'tar' package used by '@lerna/legacy-package-management' v6.6.2 - no current fix", | ||
"expiry": "9 November 2024" | ||
"expiry": "9 December 2024" | ||
} | ||
}, | ||
{ | ||
"GHSA-2p57-rm9w-gvfp": { | ||
"active": true, | ||
"notes": "issue in 'ip' package <= 2.0.1 - no current fix", | ||
"expiry": "9 November 2024" | ||
"expiry": "9 December 2024" | ||
} | ||
}, | ||
{ | ||
"GHSA-grv7-fg5c-xmjg": { | ||
"active": true, | ||
"notes": "braces package has a vulnerability which is fixed in v3.0.3, but cannot currrently upgrade", | ||
"expiry": "9 November 2024" | ||
"expiry": "9 December 2024" | ||
} | ||
}, | ||
{ | ||
"GHSA-3h5v-q93c-6h6q": { | ||
"active": true, | ||
"notes": "ws package has a vulnerability but requires multiple package upgrades to fix", | ||
"expiry": "9 November 2024" | ||
"expiry": "9 December 2024" | ||
} | ||
}, | ||
{ | ||
"GHSA-952p-6rrq-rcjv": { | ||
"active": true, | ||
"notes": "issue in 'micromatch' package, we're currently on the highest version available so no fix", | ||
"expiry": "9 November 2024" | ||
"expiry": "9 December 2024" | ||
} | ||
}, | ||
{ | ||
"GHSA-m6fv-jmcg-4jfg": { | ||
"active": true, | ||
"notes": "issue in 'send' package within 'serve-static' package being v0.18.0, fix requires 0.19.0", | ||
"expiry": "9 November 2024" | ||
"expiry": "9 December 2024" | ||
} | ||
}, | ||
{ | ||
"GHSA-p6mc-m468-83gw": { | ||
"active": true, | ||
"notes": "issue in 'lodash.set' package use by '@cypress-audit/lighthouse>lighthouse' - no current fix", | ||
"expiry": "9 November 2024" | ||
"expiry": "9 December 2024" | ||
} | ||
} | ||
] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+74.1 KB
...image-diff-screenshots/baseline/IcDataTable.cy.tsx-column-header-truncation.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.