From 671d91c009f788c1b049285558d93fa0a51589b0 Mon Sep 17 00:00:00 2001 From: Bartosz Kaszubowski Date: Wed, 2 Dec 2020 11:22:48 +0100 Subject: [PATCH 1/6] chore(ci): run V1 Build and Migration CLI test conditionally on CI --- .github/workflows/migration-cli-e2e-test.yml | 16 +++++++++++++--- .github/workflows/nodejs-windows.yml | 11 ++++++++--- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/.github/workflows/migration-cli-e2e-test.yml b/.github/workflows/migration-cli-e2e-test.yml index a75df136059b..136e197ee535 100644 --- a/.github/workflows/migration-cli-e2e-test.yml +++ b/.github/workflows/migration-cli-e2e-test.yml @@ -1,15 +1,25 @@ name: Migration CLI E2E Test on: - push: - branches: - - master pull_request: branches: - master jobs: + check: + runs-on: ubuntu-latest + outputs: + migration: ${{ steps.filter.outputs.migration }} + steps: + - uses: dorny/paths-filter@v2 + id: filter + with: + filters: | + migration: + - 'packages/docusaurus-migration/**' build: + needs: check + if: ${{ needs.check.outputs.migration == 'true' }} runs-on: ubuntu-latest strategy: matrix: diff --git a/.github/workflows/nodejs-windows.yml b/.github/workflows/nodejs-windows.yml index e7bde9a7cdc3..85c91ad573f7 100644 --- a/.github/workflows/nodejs-windows.yml +++ b/.github/workflows/nodejs-windows.yml @@ -1,9 +1,6 @@ name: Windows Build Test on: - push: - branches: - - master pull_request: branches: - master @@ -16,6 +13,13 @@ jobs: node: ['10'] steps: - uses: actions/checkout@v2 + - uses: dorny/paths-filter@v2 + id: filter + with: + filters: | + v1: + - 'packages/docusaurus-1.x/**' + - 'packages/docusaurus-init-1.x/**' - name: Use Node.js ${{ matrix.node }} uses: actions/setup-node@v1 with: @@ -23,6 +27,7 @@ jobs: - name: Installation run: yarn || yarn || yarn # 3 attempts to avoid timeout errors... - name: Docusaurus 1 Build + if: steps.filter.outputs.v1 == 'true' run: yarn build:v1 - name: Docusaurus 2 Build run: yarn build:v2 From 3fa4817757870c6807d94c375e46315f943531d2 Mon Sep 17 00:00:00 2001 From: Bartosz Kaszubowski Date: Wed, 2 Dec 2020 11:42:19 +0100 Subject: [PATCH 2/6] chore(ci): extend lighthouse timeout to 5 minutes --- .github/workflows/lighthouseCI.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/lighthouseCI.yml b/.github/workflows/lighthouseCI.yml index 3c1c6659cd0c..86350bc70df8 100644 --- a/.github/workflows/lighthouseCI.yml +++ b/.github/workflows/lighthouseCI.yml @@ -23,6 +23,7 @@ jobs: id: netlify with: site_name: 'docusaurus-2' + max_timeout: 300 - name: Audit URLs using Lighthouse id: lighthouse_audit uses: treosh/lighthouse-ci-action@v3 From 011bafe1152cda7a4d2f2129e0e991d831fdefc1 Mon Sep 17 00:00:00 2001 From: Bartosz Kaszubowski Date: Wed, 2 Dec 2020 13:10:59 +0100 Subject: [PATCH 3/6] chore(ci): attempt to speed up build size check --- .github/workflows/build-size.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-size.yml b/.github/workflows/build-size.yml index 8a492a3c6e95..a11d6b9e4aab 100644 --- a/.github/workflows/build-size.yml +++ b/.github/workflows/build-size.yml @@ -10,9 +10,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - name: Navigate to website directory + run: cd website - uses: preactjs/compressed-size-action@v2 with: repo-token: '${{ secrets.GITHUB_TOKEN }}' - pattern: '{website/build/main*js,website/build/styles*css,website/build/index.html,website/build/blog/**/introducing-docusaurus/*,website/build/docs/introduction/index.html}' + pattern: '{build/main*js,build/styles*css,build/index.html,build/blog/**/introducing-docusaurus/*,build/docs/introduction/index.html}' strip-hash: '\.([^;]\w{7})\.' minimum-change-threshold: 100 From 9a4e74a11404baf70f12936d0da9c19f976ec190 Mon Sep 17 00:00:00 2001 From: Bartosz Kaszubowski Date: Wed, 2 Dec 2020 18:25:37 +0100 Subject: [PATCH 4/6] chore(ci): use different build command in build size check --- .github/workflows/build-size.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-size.yml b/.github/workflows/build-size.yml index a11d6b9e4aab..923bfbf5a435 100644 --- a/.github/workflows/build-size.yml +++ b/.github/workflows/build-size.yml @@ -10,11 +10,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Navigate to website directory - run: cd website - uses: preactjs/compressed-size-action@v2 with: + build-script: "build:v2" repo-token: '${{ secrets.GITHUB_TOKEN }}' - pattern: '{build/main*js,build/styles*css,build/index.html,build/blog/**/introducing-docusaurus/*,build/docs/introduction/index.html}' + pattern: '{website/build/main*js,website/build/styles*css,website/build/index.html,website/build/blog/**/introducing-docusaurus/*,website/build/docs/introduction/index.html}' strip-hash: '\.([^;]\w{7})\.' minimum-change-threshold: 100 From 28a1203c4a7617808877986c76b35ed22d7e8f03 Mon Sep 17 00:00:00 2001 From: Bartosz Kaszubowski Date: Wed, 2 Dec 2020 18:46:51 +0100 Subject: [PATCH 5/6] chore(ci): use only one locale in build size report workflow --- .github/workflows/build-size.yml | 2 +- package.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-size.yml b/.github/workflows/build-size.yml index 923bfbf5a435..1e739035fd19 100644 --- a/.github/workflows/build-size.yml +++ b/.github/workflows/build-size.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v2 - uses: preactjs/compressed-size-action@v2 with: - build-script: "build:v2" + build-script: "build:v2:en" repo-token: '${{ secrets.GITHUB_TOKEN }}' pattern: '{website/build/main*js,website/build/styles*css,website/build/index.html,website/build/blog/**/introducing-docusaurus/*,website/build/docs/introduction/index.html}' strip-hash: '\.([^;]\w{7})\.' diff --git a/package.json b/package.json index f021a6a99597..e7664b32e34d 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "build:v2": "yarn workspace docusaurus-2-website build", "build:v2:baseUrl": "yarn workspace docusaurus-2-website build:baseUrl", "build:v2:blogOnly": "yarn workspace docusaurus-2-website build:blogOnly", + "build:v2:en": "yarn workspace docusaurus-2-website build --locale en", "serve:v1": "serve website-1.x/build/docusaurus", "serve:v2": "yarn workspace docusaurus-2-website serve", "serve:v2:baseUrl": "serve website", From d0d667b643d1a4cee5704a5d91fe5cfcbe0dc105 Mon Sep 17 00:00:00 2001 From: Bartosz Kaszubowski Date: Wed, 2 Dec 2020 19:20:52 +0100 Subject: [PATCH 6/6] chore(ci): fix quotes, move build-script param down --- .github/workflows/build-size.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-size.yml b/.github/workflows/build-size.yml index 1e739035fd19..1dcba34a320b 100644 --- a/.github/workflows/build-size.yml +++ b/.github/workflows/build-size.yml @@ -12,8 +12,8 @@ jobs: - uses: actions/checkout@v2 - uses: preactjs/compressed-size-action@v2 with: - build-script: "build:v2:en" repo-token: '${{ secrets.GITHUB_TOKEN }}' + build-script: 'build:v2:en' pattern: '{website/build/main*js,website/build/styles*css,website/build/index.html,website/build/blog/**/introducing-docusaurus/*,website/build/docs/introduction/index.html}' strip-hash: '\.([^;]\w{7})\.' minimum-change-threshold: 100