From 943205832b3e43146c0f8ce1fac9e00ee0f355b3 Mon Sep 17 00:00:00 2001 From: Oleg Pimenov Date: Fri, 28 Jan 2022 16:50:38 +0300 Subject: [PATCH 01/11] chore: init vercel --- .github/workflows/docs-preview.yml | 48 ++++++++++++++++++++++++++++++ vercel.json | 18 +++++++++++ 2 files changed, 66 insertions(+) create mode 100644 .github/workflows/docs-preview.yml create mode 100644 vercel.json diff --git a/.github/workflows/docs-preview.yml b/.github/workflows/docs-preview.yml new file mode 100644 index 000000000..662f658e3 --- /dev/null +++ b/.github/workflows/docs-preview.yml @@ -0,0 +1,48 @@ +name: Docs Preview + +on: + pull_request: + branches: + - master + +jobs: + deploy: + if: github.event.pull_request.head.repo.full_name == github.repository + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - uses: actions/cache@v1 + with: + key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} + restore-keys: | + ${{ runner.os }}-node- + + - name: Install + run: yarn install + + - name: Build Mosaic Docs + run: | + yarn run build:cdk + yarn run build:mosaic + yarn run build:mosaic-luxon-adapter + yarn run build:mosaic-moment-adapter + yarn run styles:built-all + yarn run build:package-design-tokens + yarn run build:mosaic-examples-module + yarn run build:mosaic-examples + yarn run build:docs-content && yarn run build:highlight && yarn run build:package-docs-content + yarn run docs:prod-build --progress false --output-path dist/releases/mosaic-docs + + - name: Vercel Deployment + id: vercel-action + uses: amondnet/vercel-action@v20.0.0 + with: + vercel-token: ${{ secrets.ZEIT_TOKEN }} + github-token: ${{ secrets.GITHUB_TOKEN }} + vercel-org-id: ${{ secrets.VERCEL_ORG_ID}} + vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID}} + vercel-args: + '--confirm ./dist/releases/mosaic-docs --scope ptsecurity' + diff --git a/vercel.json b/vercel.json new file mode 100644 index 000000000..9065ba87b --- /dev/null +++ b/vercel.json @@ -0,0 +1,18 @@ +{ + "version": 2, + "scope": "ptsecurity", + "github": { + "enabled": false + }, + "routes": [ + { + "src": "/assets/(.*)", + "dest": "/assets/$1" + }, + { "src": "/(.*).js", "dest": "/$1.js" }, + { "src": "/(.*).css", "dest": "/$1.css" }, + { "src": "/(.*).svg", "dest": "/$1.svg" }, + { "src": "/(.*).json", "dest": "/$1.json" }, + { "src": "/(.*).html", "dest": "/$1.html" } + ] +} From cd71b4165b1bf0354b3c58c9a5ed27ed310548c1 Mon Sep 17 00:00:00 2001 From: Oleg Pimenov Date: Fri, 28 Jan 2022 16:50:51 +0300 Subject: [PATCH 02/11] chore: init vercel --- .github/workflows/docs-preview.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docs-preview.yml b/.github/workflows/docs-preview.yml index 662f658e3..61fa50de0 100644 --- a/.github/workflows/docs-preview.yml +++ b/.github/workflows/docs-preview.yml @@ -11,16 +11,21 @@ jobs: runs-on: ubuntu-latest steps: + - name: Checkout code - uses: actions/checkout@v2 - - uses: actions/cache@v1 + - name: Restore Cache + uses: actions/cache@v2 with: - key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} + path: | + node_modules + */*/node_modules + key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} restore-keys: | - ${{ runner.os }}-node- + ${{ runner.os }}-yarn- - name: Install - run: yarn install + run: yarn install --frozen-lockfile - name: Build Mosaic Docs run: | From 8850dc55b600f92f805e4d3482685d2ecf9a47cd Mon Sep 17 00:00:00 2001 From: Oleg Pimenov Date: Fri, 28 Jan 2022 18:13:39 +0300 Subject: [PATCH 03/11] chore: init vercel --- .github/workflows/docs-preview.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docs-preview.yml b/.github/workflows/docs-preview.yml index 61fa50de0..f7ef517e9 100644 --- a/.github/workflows/docs-preview.yml +++ b/.github/workflows/docs-preview.yml @@ -44,9 +44,9 @@ jobs: id: vercel-action uses: amondnet/vercel-action@v20.0.0 with: - vercel-token: ${{ secrets.ZEIT_TOKEN }} - github-token: ${{ secrets.GITHUB_TOKEN }} - vercel-org-id: ${{ secrets.VERCEL_ORG_ID}} + vercel-token: ${{ secrets.VERCEL_TOKEN }} + github-token: ${{ secrets.GH_TOKEN }} + vercel-org-id: ${{ secrets.VERCEL_TEAM_ID}} vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID}} vercel-args: '--confirm ./dist/releases/mosaic-docs --scope ptsecurity' From f1bdd14f2b59d9f5d9ccd77bd46ada6ad9f5492e Mon Sep 17 00:00:00 2001 From: Oleg Pimenov Date: Mon, 31 Jan 2022 09:23:38 +0300 Subject: [PATCH 04/11] fix: yaml action --- .github/workflows/docs-preview.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs-preview.yml b/.github/workflows/docs-preview.yml index f7ef517e9..7fb859a5d 100644 --- a/.github/workflows/docs-preview.yml +++ b/.github/workflows/docs-preview.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Checkout code - - uses: actions/checkout@v2 + uses: actions/checkout@v2 - name: Restore Cache uses: actions/cache@v2 From 26ba27f292e5fef98e88b6c1e1aa71d97bf8838c Mon Sep 17 00:00:00 2001 From: Oleg Pimenov Date: Mon, 31 Jan 2022 09:45:38 +0300 Subject: [PATCH 05/11] chore: 404 --- .github/workflows/docs-preview.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docs-preview.yml b/.github/workflows/docs-preview.yml index 7fb859a5d..fcff650de 100644 --- a/.github/workflows/docs-preview.yml +++ b/.github/workflows/docs-preview.yml @@ -38,7 +38,7 @@ jobs: yarn run build:mosaic-examples-module yarn run build:mosaic-examples yarn run build:docs-content && yarn run build:highlight && yarn run build:package-docs-content - yarn run docs:prod-build --progress false --output-path dist/releases/mosaic-docs + yarn run docs:prod-build --output-path dist/mosaic-docs - name: Vercel Deployment id: vercel-action @@ -48,6 +48,7 @@ jobs: github-token: ${{ secrets.GH_TOKEN }} vercel-org-id: ${{ secrets.VERCEL_TEAM_ID}} vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID}} + working-directory: dist/mosaic-docs vercel-args: - '--confirm ./dist/releases/mosaic-docs --scope ptsecurity' + '--scope ptsecurity' From 92f95b1f9b2c56baca8f0f9896d2db9ab2891a94 Mon Sep 17 00:00:00 2001 From: Oleg Pimenov Date: Mon, 31 Jan 2022 13:32:27 +0300 Subject: [PATCH 06/11] chore: vercel --- .github/workflows/docs-preview.yml | 3 +-- vercel.json | 13 ++----------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/.github/workflows/docs-preview.yml b/.github/workflows/docs-preview.yml index fcff650de..f85911836 100644 --- a/.github/workflows/docs-preview.yml +++ b/.github/workflows/docs-preview.yml @@ -49,6 +49,5 @@ jobs: vercel-org-id: ${{ secrets.VERCEL_TEAM_ID}} vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID}} working-directory: dist/mosaic-docs - vercel-args: - '--scope ptsecurity' + scope: ptsecurity diff --git a/vercel.json b/vercel.json index 9065ba87b..3bc875101 100644 --- a/vercel.json +++ b/vercel.json @@ -1,18 +1,9 @@ { + "name": "mosaic", "version": 2, "scope": "ptsecurity", "github": { "enabled": false }, - "routes": [ - { - "src": "/assets/(.*)", - "dest": "/assets/$1" - }, - { "src": "/(.*).js", "dest": "/$1.js" }, - { "src": "/(.*).css", "dest": "/$1.css" }, - { "src": "/(.*).svg", "dest": "/$1.svg" }, - { "src": "/(.*).json", "dest": "/$1.json" }, - { "src": "/(.*).html", "dest": "/$1.html" } - ] + "builds": [{ "src": "dist/mosaic-docs/**", "use": "@vercel/static" }] } From a273772fe0d0b5343fd87b3da105984ab9624cd9 Mon Sep 17 00:00:00 2001 From: Oleg Pimenov Date: Tue, 1 Feb 2022 09:16:54 +0300 Subject: [PATCH 07/11] chore: vercel --- .github/workflows/docs-preview.yml | 1 - vercel.json | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/docs-preview.yml b/.github/workflows/docs-preview.yml index f85911836..527ef419b 100644 --- a/.github/workflows/docs-preview.yml +++ b/.github/workflows/docs-preview.yml @@ -49,5 +49,4 @@ jobs: vercel-org-id: ${{ secrets.VERCEL_TEAM_ID}} vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID}} working-directory: dist/mosaic-docs - scope: ptsecurity diff --git a/vercel.json b/vercel.json index 3bc875101..0fd1b91b6 100644 --- a/vercel.json +++ b/vercel.json @@ -1,7 +1,6 @@ { "name": "mosaic", "version": 2, - "scope": "ptsecurity", "github": { "enabled": false }, From ef71a28abdab3b95b785d6da3148af9cda15a81b Mon Sep 17 00:00:00 2001 From: Oleg Pimenov Date: Tue, 1 Feb 2022 09:25:21 +0300 Subject: [PATCH 08/11] chore: vercel --- .github/workflows/docs-preview.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docs-preview.yml b/.github/workflows/docs-preview.yml index 527ef419b..f85911836 100644 --- a/.github/workflows/docs-preview.yml +++ b/.github/workflows/docs-preview.yml @@ -49,4 +49,5 @@ jobs: vercel-org-id: ${{ secrets.VERCEL_TEAM_ID}} vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID}} working-directory: dist/mosaic-docs + scope: ptsecurity From 46c2a15ead6ca975357b7febbb0310b1ee07c077 Mon Sep 17 00:00:00 2001 From: Oleg Pimenov Date: Tue, 1 Feb 2022 09:34:50 +0300 Subject: [PATCH 09/11] chore: vercel --- .github/workflows/docs-preview.yml | 1 - vercel.json | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/docs-preview.yml b/.github/workflows/docs-preview.yml index f85911836..527ef419b 100644 --- a/.github/workflows/docs-preview.yml +++ b/.github/workflows/docs-preview.yml @@ -49,5 +49,4 @@ jobs: vercel-org-id: ${{ secrets.VERCEL_TEAM_ID}} vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID}} working-directory: dist/mosaic-docs - scope: ptsecurity diff --git a/vercel.json b/vercel.json index 0fd1b91b6..e6293ef80 100644 --- a/vercel.json +++ b/vercel.json @@ -3,6 +3,5 @@ "version": 2, "github": { "enabled": false - }, - "builds": [{ "src": "dist/mosaic-docs/**", "use": "@vercel/static" }] + } } From 3062ea7796732dbb356e0fa8a720efef75a3f4c3 Mon Sep 17 00:00:00 2001 From: Oleg Pimenov Date: Tue, 1 Feb 2022 09:50:12 +0300 Subject: [PATCH 10/11] chore: vercel cli --- .github/workflows/docs-preview.yml | 2 +- .gitignore | 3 ++- vercel.json | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docs-preview.yml b/.github/workflows/docs-preview.yml index 527ef419b..4fc31b8a2 100644 --- a/.github/workflows/docs-preview.yml +++ b/.github/workflows/docs-preview.yml @@ -48,5 +48,5 @@ jobs: github-token: ${{ secrets.GH_TOKEN }} vercel-org-id: ${{ secrets.VERCEL_TEAM_ID}} vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID}} - working-directory: dist/mosaic-docs + vercel-args: '--scope ptsecurity --confirm ./dist/mosaic-docs' diff --git a/.gitignore b/.gitignore index 6f4fe86db..f5852eecd 100644 --- a/.gitignore +++ b/.gitignore @@ -33,4 +33,5 @@ npm-debug.log /.angular -.ai \ No newline at end of file +.ai +.vercel diff --git a/vercel.json b/vercel.json index e6293ef80..35d72cb93 100644 --- a/vercel.json +++ b/vercel.json @@ -1,6 +1,4 @@ { - "name": "mosaic", - "version": 2, "github": { "enabled": false } From 0ab1b8db0c10e987f9a0aae258743586ec078ea6 Mon Sep 17 00:00:00 2001 From: Oleg Pimenov Date: Tue, 1 Feb 2022 11:17:51 +0300 Subject: [PATCH 11/11] chore: vercel cli --- .github/workflows/docs-preview.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs-preview.yml b/.github/workflows/docs-preview.yml index 4fc31b8a2..3b25825b0 100644 --- a/.github/workflows/docs-preview.yml +++ b/.github/workflows/docs-preview.yml @@ -48,5 +48,5 @@ jobs: github-token: ${{ secrets.GH_TOKEN }} vercel-org-id: ${{ secrets.VERCEL_TEAM_ID}} vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID}} - vercel-args: '--scope ptsecurity --confirm ./dist/mosaic-docs' + vercel-args: '--scope=ptsecurity --confirm ./dist/mosaic-docs'