From baac440551bbaa57a58706ebdaf3f9428158227c Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 31 Aug 2022 10:19:25 +0200 Subject: [PATCH 01/10] fix: bump versions --- .github/workflows/asset-uploader.yml | 6 ++---- .github/workflows/design-system.yml | 6 ++---- .github/workflows/eslint-config-custom.yml | 6 ++---- .github/workflows/http-client.yml | 6 ++---- .github/workflows/icons.yml | 6 ++---- .github/workflows/jest-config.yml | 6 ++---- .github/workflows/react-sdk.yml | 6 ++---- .github/workflows/tsconfig.yml | 6 ++---- 8 files changed, 16 insertions(+), 32 deletions(-) diff --git a/.github/workflows/asset-uploader.yml b/.github/workflows/asset-uploader.yml index 6169db3850..5fe23e6923 100644 --- a/.github/workflows/asset-uploader.yml +++ b/.github/workflows/asset-uploader.yml @@ -1,10 +1,8 @@ name: Asset Uploader on: push: - paths: - - "packages/asset-uploader/**/*" - - ".github/workflows/asset-uploader.yml" - - ".github/actions/publish/action.yaml" + branches: + - main jobs: publish: runs-on: ubuntu-latest diff --git a/.github/workflows/design-system.yml b/.github/workflows/design-system.yml index b7b00db417..db12f59021 100644 --- a/.github/workflows/design-system.yml +++ b/.github/workflows/design-system.yml @@ -1,10 +1,8 @@ name: Design System on: push: - paths: - - "packages/design-system/**/*" - - ".github/workflows/design-system.yml" - - ".github/actions/publish/action.yaml" + branches: + - main jobs: publish: runs-on: ubuntu-latest diff --git a/.github/workflows/eslint-config-custom.yml b/.github/workflows/eslint-config-custom.yml index 86952ce555..bbdac7623c 100644 --- a/.github/workflows/eslint-config-custom.yml +++ b/.github/workflows/eslint-config-custom.yml @@ -1,10 +1,8 @@ name: Eslint Config on: push: - paths: - - "packages/eslint-config-custom/**/*" - - ".github/workflows/eslint-config-custom.yml" - - ".github/actions/publish/action.yaml" + branches: + - main jobs: publish: runs-on: ubuntu-latest diff --git a/.github/workflows/http-client.yml b/.github/workflows/http-client.yml index 6a7ef77b88..1053a0be35 100644 --- a/.github/workflows/http-client.yml +++ b/.github/workflows/http-client.yml @@ -1,10 +1,8 @@ name: HTTP Client on: push: - paths: - - "packages/http-client/**/*" - - ".github/workflows/http-client.yml" - - ".github/actions/publish/action.yaml" + branches: + - main jobs: publish: runs-on: ubuntu-latest diff --git a/.github/workflows/icons.yml b/.github/workflows/icons.yml index 9a62e16ccc..595b5875bb 100644 --- a/.github/workflows/icons.yml +++ b/.github/workflows/icons.yml @@ -1,10 +1,8 @@ name: Icons on: push: - paths: - - "packages/icons/**/*" - - ".github/workflows/icons-publish.yml" - - ".github/actions/publish/action.yaml" + branches: + - main jobs: publish: runs-on: ubuntu-latest diff --git a/.github/workflows/jest-config.yml b/.github/workflows/jest-config.yml index 76d6fe8a56..3894914f73 100644 --- a/.github/workflows/jest-config.yml +++ b/.github/workflows/jest-config.yml @@ -1,10 +1,8 @@ name: Jest Config on: push: - paths: - - "packages/jest-config/**/*" - - ".github/workflows/jest-config.yml" - - ".github/actions/publish/action.yaml" + branches: + - main jobs: publish: runs-on: ubuntu-latest diff --git a/.github/workflows/react-sdk.yml b/.github/workflows/react-sdk.yml index 8bf0dd349e..d432c900bc 100644 --- a/.github/workflows/react-sdk.yml +++ b/.github/workflows/react-sdk.yml @@ -1,10 +1,8 @@ name: React SDK on: push: - paths: - - "packages/react-sdk/**/*" - - ".github/workflows/react-sdk.yml" - - ".github/actions/publish/action.yaml" + branches: + - main jobs: publish: runs-on: ubuntu-latest diff --git a/.github/workflows/tsconfig.yml b/.github/workflows/tsconfig.yml index 276926a981..b56f916040 100644 --- a/.github/workflows/tsconfig.yml +++ b/.github/workflows/tsconfig.yml @@ -1,10 +1,8 @@ name: Tsconfig on: push: - paths: - - "packages/tsconfig/**/*" - - ".github/workflows/tsconfig.yml" - - ".github/actions/publish/action.yaml" + branches: + - main jobs: publish: runs-on: ubuntu-latest From e79660547dce953ea6a2e1acd7f32b8fa2270e67 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 31 Aug 2022 10:21:18 +0200 Subject: [PATCH 02/10] fix: gh actions --- .github/actions/publish-test/action.yaml | 38 ++++++++++++++++++++++++ .github/workflows/package-tests.yml | 22 ++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 .github/actions/publish-test/action.yaml create mode 100644 .github/workflows/package-tests.yml diff --git a/.github/actions/publish-test/action.yaml b/.github/actions/publish-test/action.yaml new file mode 100644 index 0000000000..31166c5b0b --- /dev/null +++ b/.github/actions/publish-test/action.yaml @@ -0,0 +1,38 @@ +name: 'Release NPM package' +description: 'Release NPM package' +inputs: + 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' + default: 'null' + required: true +runs: + using: "composite" + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: 16 + registry-url: 'https://registry.npmjs.org' + - name: Install dependencies and build 🔧 + run: yarn install + shell: bash + - 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 }} --access public --dry-run + shell: bash + env: + NODE_AUTH_TOKEN: ${{ inputs.token }} \ No newline at end of file diff --git a/.github/workflows/package-tests.yml b/.github/workflows/package-tests.yml new file mode 100644 index 0000000000..870188e893 --- /dev/null +++ b/.github/workflows/package-tests.yml @@ -0,0 +1,22 @@ +name: Asset Uploader +on: + push: + paths: + - "packages/**/*" + - ".github/workflows/package-tests.yml" + - ".github/actions/publish-test/action.yaml" +jobs: + publish: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: ./.github/actions/publish-test + with: + workdir: ./packages/asset-uploader + filter: "@webstudio-is/asset-uploader" + token: ${{ secrets.NPM_TOKEN }} + - uses: ./.github/actions/publish-test + with: + workdir: ./packages/design-system + filter: "@webstudio-is/design-system" + token: ${{ secrets.NPM_TOKEN }} From e98742ae21fd0ac3cadbc3b12ee5b3fd9e7cdf2a Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 31 Aug 2022 10:22:47 +0200 Subject: [PATCH 03/10] fix: gh actions --- .github/workflows/package-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package-tests.yml b/.github/workflows/package-tests.yml index 870188e893..cd0d865b87 100644 --- a/.github/workflows/package-tests.yml +++ b/.github/workflows/package-tests.yml @@ -6,7 +6,7 @@ on: - ".github/workflows/package-tests.yml" - ".github/actions/publish-test/action.yaml" jobs: - publish: + publish-test: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 From 97c1a45f7c6cba2943cea9dfeb952d1d437c20a3 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 31 Aug 2022 10:27:28 +0200 Subject: [PATCH 04/10] fix: gh actions --- .github/workflows/package-tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/package-tests.yml b/.github/workflows/package-tests.yml index cd0d865b87..52ee02cfab 100644 --- a/.github/workflows/package-tests.yml +++ b/.github/workflows/package-tests.yml @@ -1,4 +1,4 @@ -name: Asset Uploader +name: Package tests (dry-run) on: push: paths: @@ -11,11 +11,13 @@ jobs: steps: - uses: actions/checkout@v3 - uses: ./.github/actions/publish-test + if: always() with: workdir: ./packages/asset-uploader filter: "@webstudio-is/asset-uploader" token: ${{ secrets.NPM_TOKEN }} - uses: ./.github/actions/publish-test + if: always() with: workdir: ./packages/design-system filter: "@webstudio-is/design-system" From 021d14081423841964f4c0169249f63aed93ac9e Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 31 Aug 2022 10:34:15 +0200 Subject: [PATCH 05/10] fix: gh actions --- .github/workflows/package-tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/package-tests.yml b/.github/workflows/package-tests.yml index 52ee02cfab..bfae97b6b5 100644 --- a/.github/workflows/package-tests.yml +++ b/.github/workflows/package-tests.yml @@ -5,6 +5,9 @@ on: - "packages/**/*" - ".github/workflows/package-tests.yml" - ".github/actions/publish-test/action.yaml" + pull_request_target: + types: + - opened jobs: publish-test: runs-on: ubuntu-latest From 64cd7e8920d35cf604b9bc4f3898feb72aa94e2d Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 31 Aug 2022 10:34:51 +0200 Subject: [PATCH 06/10] fix: gh actions --- .github/workflows/package-tests.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/package-tests.yml b/.github/workflows/package-tests.yml index bfae97b6b5..41ff82f3f2 100644 --- a/.github/workflows/package-tests.yml +++ b/.github/workflows/package-tests.yml @@ -1,11 +1,10 @@ name: Package tests (dry-run) on: - push: + pull_request_target: paths: - "packages/**/*" - ".github/workflows/package-tests.yml" - ".github/actions/publish-test/action.yaml" - pull_request_target: types: - opened jobs: From 033a22e8efd4c597f3267e15ef7dbd9ab0bb41ff Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 31 Aug 2022 10:36:45 +0200 Subject: [PATCH 07/10] fix: gh actions --- .github/workflows/package-tests.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/package-tests.yml b/.github/workflows/package-tests.yml index 41ff82f3f2..52ee02cfab 100644 --- a/.github/workflows/package-tests.yml +++ b/.github/workflows/package-tests.yml @@ -1,12 +1,10 @@ name: Package tests (dry-run) on: - pull_request_target: + push: paths: - "packages/**/*" - ".github/workflows/package-tests.yml" - ".github/actions/publish-test/action.yaml" - types: - - opened jobs: publish-test: runs-on: ubuntu-latest From 4112133d37c029b7a5ab9739e7ba292167032f96 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 31 Aug 2022 10:38:23 +0200 Subject: [PATCH 08/10] fix: gh actions --- .github/workflows/package-tests.yml | 36 +++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/.github/workflows/package-tests.yml b/.github/workflows/package-tests.yml index 52ee02cfab..c9a3210ef7 100644 --- a/.github/workflows/package-tests.yml +++ b/.github/workflows/package-tests.yml @@ -22,3 +22,39 @@ jobs: workdir: ./packages/design-system filter: "@webstudio-is/design-system" token: ${{ secrets.NPM_TOKEN }} + - uses: ./.github/actions/publish-test + if: always() + with: + workdir: ./packages/eslint-config-custom + filter: "@webstudio-is/eslint-config-custom" + token: ${{ secrets.NPM_TOKEN }} + - uses: ./.github/actions/publish-test + if: always() + with: + workdir: ./packages/http-client + filter: "@webstudio-is/http-client" + token: ${{ secrets.NPM_TOKEN }} + - uses: ./.github/actions/publish-test + if: always() + with: + workdir: ./packages/icons + filter: "@webstudio-is/icons" + token: ${{ secrets.NPM_TOKEN }} + - uses: ./.github/actions/publish-test + if: always() + with: + workdir: ./packages/jest-config + filter: "@webstudio-is/jest-config" + token: ${{ secrets.NPM_TOKEN }} + - uses: ./.github/actions/publish-test + if: always() + with: + workdir: ./packages/react-sdk + filter: "@webstudio-is/react-sdk" + token: ${{ secrets.NPM_TOKEN }} + - uses: ./.github/actions/publish-test + if: always() + with: + workdir: ./packages/tsconfig + filter: "@webstudio-is/tsconfig" + token: ${{ secrets.NPM_TOKEN }} \ No newline at end of file From dd1091cf907f806deb947a7cc825587434caf901 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 2 Sep 2022 15:05:51 +0200 Subject: [PATCH 09/10] Gh action fixes (#4) --- .github/workflows/asset-uploader.yml | 4 ++++ .github/workflows/design-system.yml | 4 ++++ .github/workflows/eslint-config-custom.yml | 4 ++++ .github/workflows/http-client.yml | 4 ++++ .github/workflows/icons.yml | 4 ++++ .github/workflows/jest-config.yml | 4 ++++ .github/workflows/react-sdk.yml | 4 ++++ .github/workflows/tsconfig.yml | 4 ++++ 8 files changed, 32 insertions(+) diff --git a/.github/workflows/asset-uploader.yml b/.github/workflows/asset-uploader.yml index 5fe23e6923..13da006e5e 100644 --- a/.github/workflows/asset-uploader.yml +++ b/.github/workflows/asset-uploader.yml @@ -1,6 +1,10 @@ name: Asset Uploader on: push: + paths: + - "packages/asset-uploader/**/*" + - ".github/workflows/package-tests.yml" + - ".github/actions/publish-test/action.yaml" branches: - main jobs: diff --git a/.github/workflows/design-system.yml b/.github/workflows/design-system.yml index db12f59021..df6accccef 100644 --- a/.github/workflows/design-system.yml +++ b/.github/workflows/design-system.yml @@ -1,6 +1,10 @@ name: Design System on: push: + paths: + - "packages/design-system/**/*" + - ".github/workflows/package-tests.yml" + - ".github/actions/publish-test/action.yaml" branches: - main jobs: diff --git a/.github/workflows/eslint-config-custom.yml b/.github/workflows/eslint-config-custom.yml index bbdac7623c..4683e1433a 100644 --- a/.github/workflows/eslint-config-custom.yml +++ b/.github/workflows/eslint-config-custom.yml @@ -1,6 +1,10 @@ name: Eslint Config on: push: + paths: + - "packages/eslint-config-custom/**/*" + - ".github/workflows/package-tests.yml" + - ".github/actions/publish-test/action.yaml" branches: - main jobs: diff --git a/.github/workflows/http-client.yml b/.github/workflows/http-client.yml index 1053a0be35..fda4adbf2b 100644 --- a/.github/workflows/http-client.yml +++ b/.github/workflows/http-client.yml @@ -1,6 +1,10 @@ name: HTTP Client on: push: + paths: + - "packages/http-client/**/*" + - ".github/workflows/package-tests.yml" + - ".github/actions/publish-test/action.yaml" branches: - main jobs: diff --git a/.github/workflows/icons.yml b/.github/workflows/icons.yml index 595b5875bb..a5fbc788af 100644 --- a/.github/workflows/icons.yml +++ b/.github/workflows/icons.yml @@ -1,6 +1,10 @@ name: Icons on: push: + paths: + - "packages/icons/**/*" + - ".github/workflows/package-tests.yml" + - ".github/actions/publish-test/action.yaml" branches: - main jobs: diff --git a/.github/workflows/jest-config.yml b/.github/workflows/jest-config.yml index 3894914f73..40691a647e 100644 --- a/.github/workflows/jest-config.yml +++ b/.github/workflows/jest-config.yml @@ -1,6 +1,10 @@ name: Jest Config on: push: + paths: + - "packages/jest-config/**/*" + - ".github/workflows/package-tests.yml" + - ".github/actions/publish-test/action.yaml" branches: - main jobs: diff --git a/.github/workflows/react-sdk.yml b/.github/workflows/react-sdk.yml index d432c900bc..f541ba4bd6 100644 --- a/.github/workflows/react-sdk.yml +++ b/.github/workflows/react-sdk.yml @@ -1,6 +1,10 @@ name: React SDK on: push: + paths: + - "packages/react-sdk/**/*" + - ".github/workflows/package-tests.yml" + - ".github/actions/publish-test/action.yaml" branches: - main jobs: diff --git a/.github/workflows/tsconfig.yml b/.github/workflows/tsconfig.yml index b56f916040..fa1a7883f1 100644 --- a/.github/workflows/tsconfig.yml +++ b/.github/workflows/tsconfig.yml @@ -1,6 +1,10 @@ name: Tsconfig on: push: + paths: + - "packages/tsconfig/**/*" + - ".github/workflows/package-tests.yml" + - ".github/actions/publish-test/action.yaml" branches: - main jobs: From f34a7ef359f1681d0cec7268cd37ca8f39d16d6d Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 2 Sep 2022 15:09:31 +0200 Subject: [PATCH 10/10] fix: gh actions --- .github/workflows/asset-uploader.yml | 2 +- .github/workflows/design-system.yml | 2 +- .github/workflows/eslint-config-custom.yml | 2 +- .github/workflows/http-client.yml | 2 +- .github/workflows/jest-config.yml | 2 +- .github/workflows/react-sdk.yml | 2 +- .github/workflows/tsconfig.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/asset-uploader.yml b/.github/workflows/asset-uploader.yml index 13da006e5e..662b47d230 100644 --- a/.github/workflows/asset-uploader.yml +++ b/.github/workflows/asset-uploader.yml @@ -3,7 +3,7 @@ on: push: paths: - "packages/asset-uploader/**/*" - - ".github/workflows/package-tests.yml" + - ".github/workflows/asset-uploader.yml" - ".github/actions/publish-test/action.yaml" branches: - main diff --git a/.github/workflows/design-system.yml b/.github/workflows/design-system.yml index df6accccef..ef7f025716 100644 --- a/.github/workflows/design-system.yml +++ b/.github/workflows/design-system.yml @@ -3,7 +3,7 @@ on: push: paths: - "packages/design-system/**/*" - - ".github/workflows/package-tests.yml" + - ".github/workflows/design-system.yml" - ".github/actions/publish-test/action.yaml" branches: - main diff --git a/.github/workflows/eslint-config-custom.yml b/.github/workflows/eslint-config-custom.yml index 4683e1433a..f53982e002 100644 --- a/.github/workflows/eslint-config-custom.yml +++ b/.github/workflows/eslint-config-custom.yml @@ -3,7 +3,7 @@ on: push: paths: - "packages/eslint-config-custom/**/*" - - ".github/workflows/package-tests.yml" + - ".github/workflows/eslint-config-custom.yml" - ".github/actions/publish-test/action.yaml" branches: - main diff --git a/.github/workflows/http-client.yml b/.github/workflows/http-client.yml index fda4adbf2b..c07e939586 100644 --- a/.github/workflows/http-client.yml +++ b/.github/workflows/http-client.yml @@ -3,7 +3,7 @@ on: push: paths: - "packages/http-client/**/*" - - ".github/workflows/package-tests.yml" + - ".github/workflows/http-client.yml" - ".github/actions/publish-test/action.yaml" branches: - main diff --git a/.github/workflows/jest-config.yml b/.github/workflows/jest-config.yml index 40691a647e..6cec1885a5 100644 --- a/.github/workflows/jest-config.yml +++ b/.github/workflows/jest-config.yml @@ -3,7 +3,7 @@ on: push: paths: - "packages/jest-config/**/*" - - ".github/workflows/package-tests.yml" + - ".github/workflows/jest-config.yml" - ".github/actions/publish-test/action.yaml" branches: - main diff --git a/.github/workflows/react-sdk.yml b/.github/workflows/react-sdk.yml index f541ba4bd6..b99a9eac8a 100644 --- a/.github/workflows/react-sdk.yml +++ b/.github/workflows/react-sdk.yml @@ -3,7 +3,7 @@ on: push: paths: - "packages/react-sdk/**/*" - - ".github/workflows/package-tests.yml" + - ".github/workflows/react-sdk.yml" - ".github/actions/publish-test/action.yaml" branches: - main diff --git a/.github/workflows/tsconfig.yml b/.github/workflows/tsconfig.yml index fa1a7883f1..07947ccbc7 100644 --- a/.github/workflows/tsconfig.yml +++ b/.github/workflows/tsconfig.yml @@ -3,7 +3,7 @@ on: push: paths: - "packages/tsconfig/**/*" - - ".github/workflows/package-tests.yml" + - ".github/workflows/tsconfig.yml" - ".github/actions/publish-test/action.yaml" branches: - main