Skip to content

Commit

Permalink
Merge branch 'master' into pdo-lx-23-refresh-after-state-update
Browse files Browse the repository at this point in the history
  • Loading branch information
xMort authored Jan 23, 2024
2 parents 54bda33 + 40876a6 commit 4f0fc66
Show file tree
Hide file tree
Showing 55 changed files with 301 additions and 120 deletions.
17 changes: 3 additions & 14 deletions .github/workflows/publish-alpha.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,11 @@ name: Release ~ Publish alpha
on:
workflow_dispatch:
jobs:
bump-version:
uses: ./.github/workflows/rw-bump-version.yml
publish-pre-release:
uses: ./.github/workflows/rw-publish-prerelase.yml
permissions:
contents: write
id-token: write
secrets: inherit
with:
source-branch: "master"
bump: "prerelease"
prerelease-id: "alpha"

publish-alpha:
needs: [bump-version]
uses: ./.github/workflows/rw-publish-version.yml
permissions:
contents: write
secrets: inherit
with:
source-branch: "master"
release-tag: "prerelease"
17 changes: 17 additions & 0 deletions .github/workflows/pull-request-prerelease.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Pull request ~ Prerelease
on:
pull_request:
types: [closed]
branches:
- master
- release

jobs:
publish-pre-release:
name: Publish pre-release
if: >
github.event.pull_request.merged == true &&
any(github.event.pull_request.labels.*.name, '==', 'publish pre-release')
uses: ./.github/workflows/rw-publish-prerelase.yml
with:
source-branch: ${{ github.event.pull_request.base.ref }}
5 changes: 3 additions & 2 deletions .github/workflows/rw-bump-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:

- name: Add repository to git safe directories to avoid dubious ownership issue
run: git config --global --add safe.directory $GITHUB_WORKSPACE
- name: Create and push branch
- name: Bum rush version and commit to source branch
env:
BUMP: ${{ inputs.bump }}
PRERELEASE_ID: ${{ inputs.prerelease-id }}
Expand All @@ -51,7 +51,8 @@ jobs:
# it needs git configured already user.email/name
rush version --bump --override-bump $BUMP --override-prerelease-id $PRERELEASE_ID
git add -A
git commit -m "Bump versions"
VERSION=$(node -p "require('./libs/sdk-ui/package.json').version")
git commit -m "Bump versions to $VERSION"
git push origin ${{ inputs.source-branch }}
- name: Get version
id: version
Expand Down
74 changes: 74 additions & 0 deletions .github/workflows/rw-publish-prerelase.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
# (C) 2024 GoodData Corporation

name: rw ~ Release ~ Publish prerelease
on:
workflow_call:
inputs:
source-branch:
required: true
description: "The name of the source branch"
type: string

# limit concurrency to one run per branch at a time
# so that we can run this from master and a release branch at the same time
# When a concurrent job or workflow is queued,
# if another job or workflow using the same concurrency group in the repository is in progress,
# the queued job or workflow will be pending. Any previously pending job or workflow in the concurrency group will be canceled.
concurrency:
group: prerelease-${{ github.event.inputs.source-branch }}
cancel-in-progress: false

jobs:
setup-params:
runs-on: [infra-small]
outputs:
prerelease-id: ${{ steps.validate-params.outputs.prerelease-id }}

steps:
- name: validate params
id: validate-params
run: |
if [ "${{ inputs.source-branch }}" = "master" ]; then
echo "prerelease-id=alpha" >> $GITHUB_OUTPUT
elif [ "${{ inputs.source-branch }}" = "release" ]; then
echo "prerelease-id=beta" >> $GITHUB_OUTPUT
else
echo "Invalid branch provided. Please provide either 'master' or 'release'."
exit 1
fi
bump-version:
needs: [setup-params]
uses: ./.github/workflows/rw-bump-version.yml
permissions:
contents: write
id-token: write
secrets: inherit
with:
source-branch: ${{ github.event.inputs.source-branch }}
bump: "prerelease"
prerelease-id: ${{ needs.setup-params.outputs.prerelease-id }}

publish-prerelease:
needs: [bump-version]
uses: ./.github/workflows/rw-publish-version.yml
permissions:
contents: read
id-token: write
secrets: inherit
with:
source-branch: ${{ github.event.inputs.source-branch }}
release-tag: "prerelease"

slack-notification:
runs-on: [infra1-small]
needs: [bump-version, publish-prerelease]
steps:
- name: Notify to slack
uses: slackapi/[email protected]
with:
channel-id: "#javascript-notifications"
slack-message: "SDK-UI versions *${{ env.RELEASE_VERSION }}* has been successfully published to NPM."
env:
RELEASE_VERSION: ${{ needs.bump-version.outputs.version }}
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
9 changes: 7 additions & 2 deletions .github/workflows/rw-publish-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,25 @@ jobs:
runs-on: [infra1-medium]
container:
image: 020413372491.dkr.ecr.us-east-1.amazonaws.com/3rdparty/library/node:18.17.0-bullseye
permissions:
contents: read
id-token: write
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
ref: ${{ inputs.source-branch }}
- name: Add repository to git safe directories to avoid dubious ownership issue
run: git config --global --add safe.directory $GITHUB_WORKSPACE
- name: Get NPM_PUBLISH_TOKEN from Vault and set it as env variable
uses: hashicorp/vault-action@v2
with:
url: "https://vault.ord1.infra.intgdc.com"
method: jwt
path: jwt/github
role: ecr-push
role: front-end
secrets: |
secret/v3/int/npm/rw-token secret | NPM_PUBLISH_TOKEN
secret/data/v3/int/npm/rw-token secret | NPM_PUBLISH_TOKEN ;
- name: Install rush
run: |
npm install -g @microsoft/rush
Expand Down
4 changes: 2 additions & 2 deletions common/config/rush/version-policies.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
{
"definitionName": "lockStepVersion",
"policyName": "sdk",
"version": "9.7.0-alpha.15",
"version": "9.7.0-alpha.17",
"nextBump": "prerelease",
"mainProject": "@gooddata/sdk-ui-all"
},
{
"definitionName": "lockStepVersion",
"policyName": "sdk-examples",
"version": "9.7.0-alpha.15",
"version": "9.7.0-alpha.17",
"nextBump": "prerelease",
"mainProject": "@gooddata/sdk-interactive-examples"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gooddata/sdk-interactive-examples-template",
"version": "9.7.0-alpha.15",
"version": "9.7.0-alpha.17",
"title": "GoodData interactive example template",
"description": "GoodData interactive example template",
"author": "GoodData Corporation",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gooddata/sdk-interactive-example-attributefilter",
"version": "9.7.0-alpha.15",
"version": "9.7.0-alpha.17",
"title": "Attribute Filter Example",
"description": "This example demonstrates how to use the AttributeFilter component to filter data in a visualization.",
"author": "GoodData Corporation",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gooddata/sdk-interactive-example-chartconfig",
"version": "9.7.0-alpha.15",
"version": "9.7.0-alpha.17",
"title": "Chart config manipulation",
"description": "This interactive example demonstrates how to manipulate the chart config.",
"author": "GoodData Corporation",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gooddata/sdk-interactive-example-columnchart",
"version": "9.7.0-alpha.15",
"version": "9.7.0-alpha.17",
"title": "ColumnChart",
"description": "This example demonstrates the usage of the ColumnChart component with the viewBy and stackBy properties.",
"author": "GoodData Corporation",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gooddata/sdk-interactive-example-combochart",
"version": "9.7.0-alpha.15",
"version": "9.7.0-alpha.17",
"title": "ComboChart",
"description": "Example demonstrates ComboChart secondaryMeasures definition. ",
"author": "GoodData Corporation",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gooddata/sdk-interactive-example-dashboard",
"version": "9.7.0-alpha.15",
"version": "9.7.0-alpha.17",
"title": "Dashboard component",
"description": "This example shows how to use the Dashboard component.",
"author": "GoodData Corporation",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gooddata/sdk-interactive-example-datefilter",
"version": "9.7.0-alpha.15",
"version": "9.7.0-alpha.17",
"title": "DateFilter",
"description": "Example demonstrates usage of Date Filter component.",
"author": "GoodData Corporation",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gooddata/sdk-interactive-example-dependentfilters",
"version": "9.7.0-alpha.15",
"version": "9.7.0-alpha.17",
"title": "Dependent Filters Example",
"description": "This example demonstrates how to use multiple attribute filters linked together to filter data in a visualization.",
"author": "GoodData Corporation",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gooddata/sdk-interactive-example-execute",
"version": "9.7.0-alpha.15",
"version": "9.7.0-alpha.17",
"title": "Execute",
"description": "This example demonstrates using Execute component and build custom visualization.",
"author": "GoodData Corporation",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gooddata/sdk-interactive-example-granularity",
"version": "9.7.0-alpha.15",
"version": "9.7.0-alpha.17",
"title": "Granularity",
"description": "This example exmplains DateFilter granularity ",
"author": "GoodData Corporation",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gooddata/sdk-interactive-example-headline",
"version": "9.7.0-alpha.15",
"version": "9.7.0-alpha.17",
"title": "Headline",
"description": "This example shows how to use the Headline component.",
"author": "GoodData Corporation",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gooddata/sdk-interactive-example-pivottable",
"version": "9.7.0-alpha.15",
"version": "9.7.0-alpha.17",
"title": "PivotTable",
"description": "Basic PivotTable manipulation.",
"author": "GoodData Corporation",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gooddata/sdk-interactive-example-relativedatefilter",
"version": "9.7.0-alpha.15",
"version": "9.7.0-alpha.17",
"title": "RelativeDateFilter",
"description": "Example demonstrates how to set relative DateFilter for visualization.",
"author": "GoodData Corporation",
Expand Down
2 changes: 1 addition & 1 deletion examples/sdk-interactive-examples/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gooddata/sdk-interactive-examples",
"version": "9.7.0-alpha.15",
"version": "9.7.0-alpha.17",
"description": "GoodData React interactive examples",
"license": "LicenseRef-LICENSE",
"author": "GoodData Corporation",
Expand Down
2 changes: 1 addition & 1 deletion libs/api-client-bear/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gooddata/api-client-bear",
"version": "9.7.0-alpha.15",
"version": "9.7.0-alpha.17",
"author": "GoodData",
"description": "API Client for the GoodData platform",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion libs/api-client-tiger/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gooddata/api-client-tiger",
"version": "9.7.0-alpha.15",
"version": "9.7.0-alpha.17",
"author": "GoodData",
"description": "API Client for GoodData Cloud and GoodData.CN",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion libs/api-model-bear/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gooddata/api-model-bear",
"version": "9.7.0-alpha.15",
"version": "9.7.0-alpha.17",
"description": "TypeScript definition files for GoodData platform",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion libs/sdk-backend-base/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gooddata/sdk-backend-base",
"version": "9.7.0-alpha.15",
"version": "9.7.0-alpha.17",
"author": "GoodData",
"description": "GoodData.UI SDK - Base for backend implementations",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion libs/sdk-backend-bear/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gooddata/sdk-backend-bear",
"version": "9.7.0-alpha.15",
"version": "9.7.0-alpha.17",
"author": "GoodData",
"description": "GoodData Backend SPI implementation for the GoodData platform",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion libs/sdk-backend-mockingbird/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gooddata/sdk-backend-mockingbird",
"version": "9.7.0-alpha.15",
"version": "9.7.0-alpha.17",
"author": "GoodData",
"description": "Mock GoodData Backend SPI implementation",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion libs/sdk-backend-spi/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gooddata/sdk-backend-spi",
"version": "9.7.0-alpha.15",
"version": "9.7.0-alpha.17",
"author": "GoodData",
"description": "GoodData Backend SPI abstraction interfaces",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion libs/sdk-backend-tiger/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gooddata/sdk-backend-tiger",
"version": "9.7.0-alpha.15",
"version": "9.7.0-alpha.17",
"author": "GoodData",
"description": "GoodData Backend SPI implementation for GoodData Cloud and GoodData.CN",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion libs/sdk-embedding/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gooddata/sdk-embedding",
"version": "9.7.0-alpha.15",
"version": "9.7.0-alpha.17",
"author": "GoodData",
"description": "GoodData Embedding APIs",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion libs/sdk-model/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gooddata/sdk-model",
"version": "9.7.0-alpha.15",
"version": "9.7.0-alpha.17",
"author": "GoodData",
"description": "GoodData Model definitions used by UI components and Backend SPI and its implementations",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion libs/sdk-ui-all/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gooddata/sdk-ui-all",
"version": "9.7.0-alpha.15",
"version": "9.7.0-alpha.17",
"author": "GoodData",
"description": "GoodData SDK - All-In-One",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion libs/sdk-ui-charts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gooddata/sdk-ui-charts",
"version": "9.7.0-alpha.15",
"version": "9.7.0-alpha.17",
"description": "GoodData.UI SDK - Charts",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion libs/sdk-ui-dashboard/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gooddata/sdk-ui-dashboard",
"version": "9.7.0-alpha.15",
"version": "9.7.0-alpha.17",
"description": "GoodData SDK - Dashboard Component",
"repository": {
"type": "git",
Expand Down
Loading

0 comments on commit 4f0fc66

Please sign in to comment.