From 3f1859417d2679e62a12d547ab2e60c1e6c75098 Mon Sep 17 00:00:00 2001 From: Michel Engelen <32863416+michelengelen@users.noreply.github.com> Date: Wed, 3 Apr 2024 15:34:09 +0200 Subject: [PATCH 1/3] [support-infra] Add release announcement to GitHub workflows (#11867) Signed-off-by: Michel Engelen <32863416+michelengelen@users.noreply.github.com> Co-authored-by: Olivier Tassinari --- .../discord-release-announcement.yaml | 20 +++++++++++++++++++ scripts/README.md | 6 +++++- scripts/releaseChangelog.mjs | 2 ++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/discord-release-announcement.yaml diff --git a/.github/workflows/discord-release-announcement.yaml b/.github/workflows/discord-release-announcement.yaml new file mode 100644 index 0000000000000..11360a820d9d1 --- /dev/null +++ b/.github/workflows/discord-release-announcement.yaml @@ -0,0 +1,20 @@ +name: Discord Release Announcement + +on: + release: + types: [prereleased, published] + +permissions: {} + +jobs: + delimiter-test: + runs-on: ubuntu-latest + name: Send message to discord + steps: + - name: parse and send message + uses: michelengelen/discord-message-action@02af30a15955ecf718049bc33b0efabf6f626e0b + with: + webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }} + username: MUI Releases + avatar-url: 'https://raw.githubusercontent.com/mui/material-ui/master/docs/public/static/logo.png' + separator: '' diff --git a/scripts/README.md b/scripts/README.md index 677fec421dd6e..1efcf952832ee 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -23,7 +23,11 @@ yarn release:changelog --release The branch to release (default: master) ``` -You can also provide the GitHub token by setting `process.env.GITHUB_TOKEN` variable. +> :warning: the script will add a separator string in form of a comment like this right after the highlights: +> `` +> This string needs to stay where it gets inserted for the automated discord announcement to work. + +You can also provide the github token by setting `process.env.GITHUB_TOKEN` variable. In case of a problem, another method to generate the changelog is available at the end of this page. diff --git a/scripts/releaseChangelog.mjs b/scripts/releaseChangelog.mjs index 01152512c8b63..cd77b2514ecc3 100644 --- a/scripts/releaseChangelog.mjs +++ b/scripts/releaseChangelog.mjs @@ -227,6 +227,8 @@ We'd like to offer a big thanks to the ${ TODO INSERT HIGHLIGHTS ${changeLogMessages.length > 0 ? '\n\n' : ''}${changeLogMessages.join('\n')} + + ### Data Grid #### \`@mui/x-data-grid@__VERSION__\` From dd20afe2668c15eb9f350ab171137c4f64931273 Mon Sep 17 00:00:00 2001 From: Gene Arch Date: Wed, 17 Apr 2024 21:48:55 -0500 Subject: [PATCH 2/3] export GridAggregationParams for use with custom aggregators (#12822) Signed-off-by: Gene Arch Co-authored-by: Rom Grk --- .../src/hooks/features/aggregation/gridAggregationInterfaces.ts | 2 +- scripts/x-data-grid-premium.exports.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/x-data-grid-premium/src/hooks/features/aggregation/gridAggregationInterfaces.ts b/packages/x-data-grid-premium/src/hooks/features/aggregation/gridAggregationInterfaces.ts index 1abf73791fd6a..9839408fe3ea8 100644 --- a/packages/x-data-grid-premium/src/hooks/features/aggregation/gridAggregationInterfaces.ts +++ b/packages/x-data-grid-premium/src/hooks/features/aggregation/gridAggregationInterfaces.ts @@ -82,7 +82,7 @@ export interface GridAggregationFunction { getCellValue?: (params: GridAggregationGetCellValueParams) => V; } -interface GridAggregationParams { +export interface GridAggregationParams { values: (V | undefined)[]; groupId: GridRowId; field: GridColDef['field']; diff --git a/scripts/x-data-grid-premium.exports.json b/scripts/x-data-grid-premium.exports.json index 5641efdd4b4cf..68ec1b10b653b 100644 --- a/scripts/x-data-grid-premium.exports.json +++ b/scripts/x-data-grid-premium.exports.json @@ -94,6 +94,7 @@ { "name": "gridAggregationLookupSelector", "kind": "Variable" }, { "name": "GridAggregationModel", "kind": "TypeAlias" }, { "name": "gridAggregationModelSelector", "kind": "Variable" }, + { "name": "GridAggregationParams", "kind": "Interface" }, { "name": "GridAggregationPosition", "kind": "TypeAlias" }, { "name": "GridAggregationRule", "kind": "Interface" }, { "name": "GridAggregationRules", "kind": "TypeAlias" }, From 7ae5258d73c7bcde5d23102b53bad48e376e9532 Mon Sep 17 00:00:00 2001 From: michel Date: Fri, 3 May 2024 15:14:19 +0200 Subject: [PATCH 3/3] testing commit --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b0499f734d2dc..d1e983f2052c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +TEST RELEASE WORKFLOW! + ## 7.0.0-beta.7 _Mar 14, 2024_