From 709ce2cf98fafc4f751c62720d6407c287c37521 Mon Sep 17 00:00:00 2001 From: Pavel Samusev Date: Thu, 1 Aug 2024 16:03:02 +0300 Subject: [PATCH 1/4] [Fix] Bump SDK version to 1.13.x --- README.md | 2 +- package.json | 4 ++-- yarn.lock | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 499aeec8..79f6099f 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,7 @@ for a more advanced example, and extra information about building an integration ### Tools setup -- [Node 20](https://nodejs.org/en) LTS +- [Node LTS version](https://nodejs.org/en) is installed > node -v # to check existing node version - [Yarn v1.22.19](https://classic.yarnpkg.com/lang/en/docs/install/) or newer is installed (yarn `major version 1` though) > yarn -v # to check existing yarn version diff --git a/package.json b/package.json index 1adb67aa..6e4707a0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "studio-ui", "private": true, - "version": "1.12.5", + "version": "1.13.0-rc.0", "type": "module", "description": "The Studio UI for CHILI GraFx", "main": "src/main.tsx", @@ -25,7 +25,7 @@ }, "dependencies": { "@chili-publish/grafx-shared-components": "^0.71.2", - "@chili-publish/studio-sdk": "^1.12.2", + "@chili-publish/studio-sdk": "https://stgrafxstudiodevpublic.blob.core.windows.net/sdk/dev-packages/499/studio-sdk.tgz", "axios": "^1.6.0", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/yarn.lock b/yarn.lock index 2aca4240..7da54c02 100644 --- a/yarn.lock +++ b/yarn.lock @@ -416,10 +416,9 @@ react-datepicker "^7.1.0" react-select "^5.6.1" -"@chili-publish/studio-sdk@^1.12.2": - version "1.12.2" - resolved "https://npm.pkg.github.com/download/@chili-publish/studio-sdk/1.12.2/0e00e8ae64540dac327e6428c163c8f53859628b#0e00e8ae64540dac327e6428c163c8f53859628b" - integrity sha512-SQIv5YW+XKxUw4djppBbRm4VFF23ZAw+AIrM2gW6gxQMM06L2ZvlB2BMClVWO/tK0YtD/4IdM2Xmu2KktSvlqA== +"@chili-publish/studio-sdk@https://stgrafxstudiodevpublic.blob.core.windows.net/sdk/dev-packages/499/studio-sdk.tgz": + version "1.12.3-rc.3" + resolved "https://stgrafxstudiodevpublic.blob.core.windows.net/sdk/dev-packages/499/studio-sdk.tgz#7e3d1ca1fac83559be872b49ba0c21fe2799795a" dependencies: penpal "6.1.0" From 9fb356ae7e9d633f93bca0ffb1a868e82abaa419 Mon Sep 17 00:00:00 2001 From: Brian Roels <54845569+brapoprod@users.noreply.github.com> Date: Fri, 2 Aug 2024 11:42:55 +0200 Subject: [PATCH 2/4] Add automated build steps --- .github/workflows/dev-stg-build.yml | 2 ++ .github/workflows/production-build.yml | 37 ++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/.github/workflows/dev-stg-build.yml b/.github/workflows/dev-stg-build.yml index 98fa38b7..03ed5580 100644 --- a/.github/workflows/dev-stg-build.yml +++ b/.github/workflows/dev-stg-build.yml @@ -163,3 +163,5 @@ jobs: NODE_AUTH_TOKEN: ${{ secrets.PACKAGE_SECRET }} with: commit-message: 'CI: bumps version to {{version}} [skip ci]' + version-type: 'prerelease' + diff --git a/.github/workflows/production-build.yml b/.github/workflows/production-build.yml index 3b8d36af..cab25e72 100644 --- a/.github/workflows/production-build.yml +++ b/.github/workflows/production-build.yml @@ -17,6 +17,14 @@ jobs: node-version: ${{ matrix.node-version }} registry-url: 'https://npm.pkg.github.com' scope: '@chili-publish' + - name: bump version + uses: phips28/gh-action-bump-version@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + NODE_AUTH_TOKEN: ${{ secrets.PACKAGE_SECRET }} + with: + commit-message: 'Release CI: bumps version to {{version}} [skip ci]' + version-type: 'patch' - name: install dependencies run: | yarn install @@ -53,3 +61,32 @@ jobs: with: inlineScript: | az storage blob upload-batch -d studio-ui -s upload/ --connection-string "${{ secrets.AZURE_CDN_STUDIO_PRD_CONNECTION_STRING }}" --overwrite true + + bump-version: + needs: build + runs-on: ubuntu-latest + strategy: + matrix: + node-version: [20] + steps: + - uses: FranzDiebold/github-env-vars-action@v2 + - uses: actions/checkout@v3 + with: + token: ${{ secrets.PACKAGE_SECRET }} + - name: Use Node ${{ matrix.node-version }} + uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node-version }} + registry-url: 'https://npm.pkg.github.com' + scope: '@chili-publish' + - name: bump version + uses: phips28/gh-action-bump-version@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + NODE_AUTH_TOKEN: ${{ secrets.PACKAGE_SECRET }} + with: + commit-message: 'CI: bumps version to {{version}} [skip ci]' + version-type: 'preminor' + + + \ No newline at end of file From 74dd8a12785a4d64c6423a4402499740c2142b77 Mon Sep 17 00:00:00 2001 From: Brian Roels <54845569+brapoprod@users.noreply.github.com> Date: Fri, 2 Aug 2024 12:00:55 +0200 Subject: [PATCH 3/4] Fix order of bump --- .github/workflows/production-build.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/production-build.yml b/.github/workflows/production-build.yml index cab25e72..2ecbb1b0 100644 --- a/.github/workflows/production-build.yml +++ b/.github/workflows/production-build.yml @@ -17,14 +17,6 @@ jobs: node-version: ${{ matrix.node-version }} registry-url: 'https://npm.pkg.github.com' scope: '@chili-publish' - - name: bump version - uses: phips28/gh-action-bump-version@master - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - NODE_AUTH_TOKEN: ${{ secrets.PACKAGE_SECRET }} - with: - commit-message: 'Release CI: bumps version to {{version}} [skip ci]' - version-type: 'patch' - name: install dependencies run: | yarn install @@ -38,6 +30,14 @@ jobs: run: yarn cover - name: build code run: yarn build + - name: bump version + uses: phips28/gh-action-bump-version@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + NODE_AUTH_TOKEN: ${{ secrets.PACKAGE_SECRET }} + with: + commit-message: 'Release CI: bumps version to {{version}} [skip ci]' + version-type: 'patch' - name: copy file branch run: | export CURRENT_PACKAGE_VERSION=$(node --eval="var pjson = require('./package.json');console.log(pjson.version);") From 7c474e11864b02b5a249fcaa0ecc0bfcbebf9b9e Mon Sep 17 00:00:00 2001 From: Pavel Samusev Date: Tue, 6 Aug 2024 11:03:36 +0300 Subject: [PATCH 4/4] chore: update SDK version --- package.json | 2 +- yarn.lock | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 6e4707a0..9e803b03 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ }, "dependencies": { "@chili-publish/grafx-shared-components": "^0.71.2", - "@chili-publish/studio-sdk": "https://stgrafxstudiodevpublic.blob.core.windows.net/sdk/dev-packages/499/studio-sdk.tgz", + "@chili-publish/studio-sdk": "^1.13.0", "axios": "^1.6.0", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/yarn.lock b/yarn.lock index 7da54c02..5d23d3b9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -416,9 +416,10 @@ react-datepicker "^7.1.0" react-select "^5.6.1" -"@chili-publish/studio-sdk@https://stgrafxstudiodevpublic.blob.core.windows.net/sdk/dev-packages/499/studio-sdk.tgz": - version "1.12.3-rc.3" - resolved "https://stgrafxstudiodevpublic.blob.core.windows.net/sdk/dev-packages/499/studio-sdk.tgz#7e3d1ca1fac83559be872b49ba0c21fe2799795a" +"@chili-publish/studio-sdk@^1.13.0": + version "1.13.0" + resolved "https://npm.pkg.github.com/download/@chili-publish/studio-sdk/1.13.0/b5a0095b575297adb24b54bc237d2c385c1e8df6#b5a0095b575297adb24b54bc237d2c385c1e8df6" + integrity sha512-Y2vqmoQhBZHth6r1HpxfXZtYSPFJQIPP7snIQd8eN2QE9y5L/ygaLltl1C8825AQizzQmXcv5d1wzIjPLvdzRQ== dependencies: penpal "6.1.0"