From d3ad9dbf080b3e508e8d60ad9dd6d9c7a45c181f Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 26 Aug 2022 15:41:24 +0200 Subject: [PATCH 1/5] fix: gh action --- .github/actions/publish/action.yaml | 32 ++++++++++++++-------- .github/workflows/asset-uploader.yml | 17 ++++++++++++ .github/workflows/design-system.yml | 5 ++-- .github/workflows/eslint-config-custom.yml | 6 ++-- .github/workflows/http-client.yml | 17 ++++++++++++ .github/workflows/icons.yml | 5 ++-- .github/workflows/jest-config.yml | 6 ++-- .github/workflows/react-sdk.yml | 5 ++-- .github/workflows/tsconfig.yml | 6 ++-- 9 files changed, 76 insertions(+), 23 deletions(-) create mode 100644 .github/workflows/asset-uploader.yml create mode 100644 .github/workflows/http-client.yml diff --git a/.github/actions/publish/action.yaml b/.github/actions/publish/action.yaml index 24a129d324..9075de4664 100644 --- a/.github/actions/publish/action.yaml +++ b/.github/actions/publish/action.yaml @@ -1,9 +1,16 @@ name: 'Release NPM package' description: 'Release NPM package' inputs: - package: - description: 'Package.json location (relative)' - default: 'package.json' + skip-build: + description: 'Skip build phase (useful for only configuration files)' + default: '' + filter: + description: 'Filter build phase by turbo' + default: '' + required: true + workdir: + description: 'Work directory for NPM publish' + default: '.' required: true token: description: 'NPM Token' @@ -16,13 +23,16 @@ runs: - uses: actions/setup-node@v3 with: node-version: 16 - - name: Install Dependencies + registry-url: 'https://registry.npmjs.org' + - name: Install dependencies and build 🔧 run: yarn install shell: bash - - uses: JS-DevTools/npm-publish@v1 - with: - token: ${{ inputs.token }} - dry-run: false - check-version: true - access: 'public' - package: ${{ inputs.package }} \ No newline at end of file + - name: Build 🔧 + if: ${{ inputs.skip-build == '' }} + run: yarn build --filter ${{ inputs.filter }} + shell: bash + - name: Publish package on NPM 📦 + run: npm publish -w ${{ inputs.workdir }} --dry-run + shell: bash + env: + NODE_AUTH_TOKEN: ${{ inputs.token }} \ No newline at end of file diff --git a/.github/workflows/asset-uploader.yml b/.github/workflows/asset-uploader.yml new file mode 100644 index 0000000000..6169db3850 --- /dev/null +++ b/.github/workflows/asset-uploader.yml @@ -0,0 +1,17 @@ +name: Asset Uploader +on: + push: + paths: + - "packages/asset-uploader/**/*" + - ".github/workflows/asset-uploader.yml" + - ".github/actions/publish/action.yaml" +jobs: + publish: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: ./.github/actions/publish + with: + workdir: ./packages/asset-uploader + filter: "@webstudio-is/asset-uploader" + token: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/design-system.yml b/.github/workflows/design-system.yml index 109456bc75..b7b00db417 100644 --- a/.github/workflows/design-system.yml +++ b/.github/workflows/design-system.yml @@ -1,4 +1,4 @@ -name: Design System Publish +name: Design System on: push: paths: @@ -12,5 +12,6 @@ jobs: - uses: actions/checkout@v3 - uses: ./.github/actions/publish with: - package: "./packages/design-system/package.json" + workdir: ./packages/design-system + filter: "@webstudio-is/design-system" token: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/eslint-config-custom.yml b/.github/workflows/eslint-config-custom.yml index 3effb53420..86952ce555 100644 --- a/.github/workflows/eslint-config-custom.yml +++ b/.github/workflows/eslint-config-custom.yml @@ -1,4 +1,4 @@ -name: Eslint Config Publish +name: Eslint Config on: push: paths: @@ -12,5 +12,7 @@ jobs: - uses: actions/checkout@v3 - uses: ./.github/actions/publish with: - package: "./packages/eslint-config-custom/package.json" + skip-build: true + workdir: ./packages/eslint-config-custom + filter: "@webstudio-is/eslint-config-custom" token: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/http-client.yml b/.github/workflows/http-client.yml new file mode 100644 index 0000000000..6a7ef77b88 --- /dev/null +++ b/.github/workflows/http-client.yml @@ -0,0 +1,17 @@ +name: HTTP Client +on: + push: + paths: + - "packages/http-client/**/*" + - ".github/workflows/http-client.yml" + - ".github/actions/publish/action.yaml" +jobs: + publish: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: ./.github/actions/publish + with: + workdir: ./packages/http-client + filter: "@webstudio-is/http-client" + token: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/icons.yml b/.github/workflows/icons.yml index 3deb808f0b..9a62e16ccc 100644 --- a/.github/workflows/icons.yml +++ b/.github/workflows/icons.yml @@ -1,4 +1,4 @@ -name: Icons Publish +name: Icons on: push: paths: @@ -12,5 +12,6 @@ jobs: - uses: actions/checkout@v3 - uses: ./.github/actions/publish with: - package: "./packages/icons/package.json" + workdir: ./packages/icons + filter: "@webstudio-is/icons" token: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/jest-config.yml b/.github/workflows/jest-config.yml index 2d5a1079cb..76d6fe8a56 100644 --- a/.github/workflows/jest-config.yml +++ b/.github/workflows/jest-config.yml @@ -1,4 +1,4 @@ -name: Jest Config Publish +name: Jest Config on: push: paths: @@ -12,5 +12,7 @@ jobs: - uses: actions/checkout@v3 - uses: ./.github/actions/publish with: - package: "./packages/jest-config/package.json" + skip-build: true + workdir: ./packages/jest-config + filter: "@webstudio-is/jest-config" token: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/react-sdk.yml b/.github/workflows/react-sdk.yml index 9a122a632b..8bf0dd349e 100644 --- a/.github/workflows/react-sdk.yml +++ b/.github/workflows/react-sdk.yml @@ -1,4 +1,4 @@ -name: SDK publish +name: React SDK on: push: paths: @@ -12,5 +12,6 @@ jobs: - uses: actions/checkout@v3 - uses: ./.github/actions/publish with: - package: "./packages/react-sdk/package.json" + workdir: ./packages/react-sdk + filter: "@webstudio-is/react-sdk" token: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/tsconfig.yml b/.github/workflows/tsconfig.yml index f9b6ed774e..276926a981 100644 --- a/.github/workflows/tsconfig.yml +++ b/.github/workflows/tsconfig.yml @@ -1,4 +1,4 @@ -name: Tsconfig Publish +name: Tsconfig on: push: paths: @@ -12,5 +12,7 @@ jobs: - uses: actions/checkout@v3 - uses: ./.github/actions/publish with: - package: "./packages/tsconfig/package.json" + skip-build: true + workdir: ./packages/tsconfig + filter: "@webstudio-is/tsconfig" token: ${{ secrets.NPM_TOKEN }} From e8869973010e63636c419de2b06a3b999e0df15d Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 29 Aug 2022 10:05:18 +0200 Subject: [PATCH 2/5] fix: gh action --- .github/actions/publish/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/publish/action.yaml b/.github/actions/publish/action.yaml index 9075de4664..fc8a4a5327 100644 --- a/.github/actions/publish/action.yaml +++ b/.github/actions/publish/action.yaml @@ -32,7 +32,7 @@ runs: run: yarn build --filter ${{ inputs.filter }} shell: bash - name: Publish package on NPM 📦 - run: npm publish -w ${{ inputs.workdir }} --dry-run + run: npm publish -w ${{ inputs.workdir }} shell: bash env: NODE_AUTH_TOKEN: ${{ inputs.token }} \ No newline at end of file From 10f917ea9217198e8dc0e682adb4a2c0d0872f0e Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 29 Aug 2022 13:43:11 +0200 Subject: [PATCH 3/5] fix: gh action --- packages/asset-uploader/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/asset-uploader/package.json b/packages/asset-uploader/package.json index 875be06eba..4712576707 100644 --- a/packages/asset-uploader/package.json +++ b/packages/asset-uploader/package.json @@ -1,6 +1,6 @@ { "name": "@webstudio-is/asset-uploader", - "version": "0.0.1", + "version": "0.1.0", "description": "Webstudio Asset Uploader", "author": "Webstudio ", "homepage": "https://webstudio.is", From 323b4f5228eb9314b489b47f557ffb27fdb3275a Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 29 Aug 2022 13:46:00 +0200 Subject: [PATCH 4/5] fix: gh action --- .github/actions/publish/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/publish/action.yaml b/.github/actions/publish/action.yaml index fc8a4a5327..930f3578c2 100644 --- a/.github/actions/publish/action.yaml +++ b/.github/actions/publish/action.yaml @@ -32,7 +32,7 @@ runs: run: yarn build --filter ${{ inputs.filter }} shell: bash - name: Publish package on NPM 📦 - run: npm publish -w ${{ inputs.workdir }} + run: npm publish -w ${{ inputs.workdir }} --access public shell: bash env: NODE_AUTH_TOKEN: ${{ inputs.token }} \ No newline at end of file From 5af49dcaa8b57095c4ce17c19a574634751dc282 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 29 Aug 2022 13:50:51 +0200 Subject: [PATCH 5/5] fix: bump versions --- packages/design-system/package.json | 2 +- packages/eslint-config-custom/package.json | 2 +- packages/icons/package.json | 2 +- packages/jest-config/package.json | 2 +- packages/prisma-client/package.json | 2 +- packages/react-sdk/package.json | 2 +- packages/tsconfig/package.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/design-system/package.json b/packages/design-system/package.json index 78fe722bc5..c5c4ddf934 100644 --- a/packages/design-system/package.json +++ b/packages/design-system/package.json @@ -1,6 +1,6 @@ { "name": "@webstudio-is/design-system", - "version": "0.1.0", + "version": "0.1.1", "description": "Webstudio Design System", "author": "Webstudio ", "homepage": "https://webstudio.is", diff --git a/packages/eslint-config-custom/package.json b/packages/eslint-config-custom/package.json index 30efd8e4c4..ea358ddc79 100644 --- a/packages/eslint-config-custom/package.json +++ b/packages/eslint-config-custom/package.json @@ -1,6 +1,6 @@ { "name": "@webstudio-is/eslint-config-custom", - "version": "1.0.0", + "version": "1.0.1", "main": "index.js", "license": "MIT", "dependencies": { diff --git a/packages/icons/package.json b/packages/icons/package.json index 69a6fb16c7..e500e09f13 100644 --- a/packages/icons/package.json +++ b/packages/icons/package.json @@ -1,6 +1,6 @@ { "name": "@webstudio-is/icons", - "version": "0.1.0", + "version": "0.1.1", "description": "Webstudio Icons", "author": "Webstudio ", "homepage": "https://webstudio.is", diff --git a/packages/jest-config/package.json b/packages/jest-config/package.json index 001d6d9a39..a7a9bc34ae 100644 --- a/packages/jest-config/package.json +++ b/packages/jest-config/package.json @@ -1,6 +1,6 @@ { "name": "@webstudio-is/jest-config", - "version": "1.0.1", + "version": "1.0.2", "license": "MIT", "dependencies": { "@types/jest": "^27.4.1", diff --git a/packages/prisma-client/package.json b/packages/prisma-client/package.json index 6a88f62ea2..4e32e240fd 100644 --- a/packages/prisma-client/package.json +++ b/packages/prisma-client/package.json @@ -1,6 +1,6 @@ { "name": "@webstudio-is/prisma-client", - "version": "0.0.1", + "version": "0.1.0", "description": "Webstudio Prisma layer", "author": "Webstudio ", "homepage": "https://webstudio.is", diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json index 5bf5020e21..eba833c4ca 100644 --- a/packages/react-sdk/package.json +++ b/packages/react-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@webstudio-is/react-sdk", - "version": "0.5.0", + "version": "0.5.1", "description": "Webstudio JavaScript / TypeScript API", "author": "Webstudio ", "homepage": "https://webstudio.is", diff --git a/packages/tsconfig/package.json b/packages/tsconfig/package.json index 56f2bd444d..a96b254ccd 100644 --- a/packages/tsconfig/package.json +++ b/packages/tsconfig/package.json @@ -1,6 +1,6 @@ { "name": "@webstudio-is/tsconfig", - "version": "1.0.0", + "version": "1.0.1", "private": false, "main": "index.js", "files": [