From a5736829ebff7eae399bedfaf177502e9721c947 Mon Sep 17 00:00:00 2001 From: Marcin Kuthan Date: Wed, 23 Nov 2022 15:32:53 +0100 Subject: [PATCH 01/10] Simplify lighthouse GH action --- .github/workflows/lighthouse-report.yml | 35 ++----------------------- 1 file changed, 2 insertions(+), 33 deletions(-) diff --git a/.github/workflows/lighthouse-report.yml b/.github/workflows/lighthouse-report.yml index 731f6f6a4..f3f9dbf76 100644 --- a/.github/workflows/lighthouse-report.yml +++ b/.github/workflows/lighthouse-report.yml @@ -19,37 +19,6 @@ jobs: - uses: actions/checkout@v3 - uses: ./.github/actions/setup - run: npm run build - - - name: Run Lighthouse CI - run: | - npm install -g @lhci/cli@0.9.x - lhci autorun - env: - LHCI_GITHUB_APP_TOKEN: ${{ secrets.LHCI_GITHUB_APP_TOKEN }} - - - name: Get app URL - id: report-url - run: | - echo ::set-output name=report_url::$(cat ./.lighthouseci/links.json | jq -r '."http://localhost:9090/"') - - - name: Print report URL - uses: actions/github-script@v6 - env: - REPORT_URL: ${{ steps.report-url.outputs.report_url }} - with: - script: | - github.rest.issues.createComment({ - issue_number: context.issue.number, - owner: context.repo.owner, - repo: context.repo.repo, - body: ':stopwatch: Lighthouse report: ' + process.env.REPORT_URL - }) - - - name: Copy bundle analysis report - run: cp build/report-*.{html,json} ./.lighthouseci - - - uses: actions/upload-artifact@v2 + - uses: treosh/lighthouse-ci-action@v9 with: - name: lighthouse-report - path: | - ./.lighthouseci/ + serverToken: ${{ secrets.LHCI_GITHUB_APP_TOKEN }} From 2dc0f6814c55693e3fa15e5772965759b2d026b8 Mon Sep 17 00:00:00 2001 From: Marcin Kuthan Date: Wed, 23 Nov 2022 16:17:03 +0100 Subject: [PATCH 02/10] fix --- .github/workflows/ci.yml | 108 ++++++++++++------------ .github/workflows/lighthouse-report.yml | 2 - 2 files changed, 54 insertions(+), 56 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 187e8c182..97bab0443 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,61 +12,61 @@ concurrency: cancel-in-progress: true jobs: - lint: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - uses: ./.github/actions/setup - - run: npm run lint - - unit-test: - runs-on: ubuntu-latest - - strategy: - matrix: - node-version: [14.20.0, 16.15.0] - - steps: - - uses: actions/checkout@v3 - - uses: ./.github/actions/setup - with: - node-version: ${{ matrix.node-version }} - - run: npm run build - - run: npm run test - - e2e-test: - runs-on: ubuntu-latest - - strategy: - matrix: - node-version: [14.20.0, 16.15.0] - - steps: - - uses: actions/checkout@v3 - - uses: ./.github/actions/setup - with: - node-version: ${{ matrix.node-version }} - - run: npm run build - - run: npm run e2e - - required-checks: - needs: [lint, unit-test, e2e-test] - runs-on: ubuntu-latest - steps: - - run: exit 0 - - deploy: - needs: required-checks - uses: ./.github/workflows/deploy.yml - secrets: inherit - - lighthouse-report: - needs: required-checks - uses: ./.github/workflows/lighthouse-report.yml - secrets: inherit +# lint: +# runs-on: ubuntu-latest +# +# steps: +# - uses: actions/checkout@v3 +# - uses: ./.github/actions/setup +# - run: npm run lint +# +# unit-test: +# runs-on: ubuntu-latest +# +# strategy: +# matrix: +# node-version: [14.20.0, 16.15.0] +# +# steps: +# - uses: actions/checkout@v3 +# - uses: ./.github/actions/setup +# with: +# node-version: ${{ matrix.node-version }} +# - run: npm run build +# - run: npm run test +# +# e2e-test: +# runs-on: ubuntu-latest +# +# strategy: +# matrix: +# node-version: [14.20.0, 16.15.0] +# +# steps: +# - uses: actions/checkout@v3 +# - uses: ./.github/actions/setup +# with: +# node-version: ${{ matrix.node-version }} +# - run: npm run build +# - run: npm run e2e +# +# required-checks: +# needs: [lint, unit-test, e2e-test] +# runs-on: ubuntu-latest +# steps: +# - run: exit 0 +# +# deploy: +# needs: required-checks +# uses: ./.github/workflows/deploy.yml +# secrets: inherit +# +# lighthouse-report: +# needs: required-checks +# uses: ./.github/workflows/lighthouse-report.yml +# secrets: inherit size-report: - needs: required-checks +# needs: required-checks uses: ./.github/workflows/size-report.yml secrets: inherit diff --git a/.github/workflows/lighthouse-report.yml b/.github/workflows/lighthouse-report.yml index f3f9dbf76..d7fc66710 100644 --- a/.github/workflows/lighthouse-report.yml +++ b/.github/workflows/lighthouse-report.yml @@ -20,5 +20,3 @@ jobs: - uses: ./.github/actions/setup - run: npm run build - uses: treosh/lighthouse-ci-action@v9 - with: - serverToken: ${{ secrets.LHCI_GITHUB_APP_TOKEN }} From aed8e724b92a8a6a3c0a7e6ca589675107d460e1 Mon Sep 17 00:00:00 2001 From: Marcin Kuthan Date: Wed, 23 Nov 2022 16:18:20 +0100 Subject: [PATCH 03/10] fix --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 97bab0443..06126ead8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -61,12 +61,12 @@ jobs: # uses: ./.github/workflows/deploy.yml # secrets: inherit # -# lighthouse-report: + lighthouse-report: # needs: required-checks -# uses: ./.github/workflows/lighthouse-report.yml -# secrets: inherit + uses: ./.github/workflows/lighthouse-report.yml + secrets: inherit - size-report: +# size-report: # needs: required-checks - uses: ./.github/workflows/size-report.yml - secrets: inherit +# uses: ./.github/workflows/size-report.yml +# secrets: inherit From 96d4f86d85c083fb042e3ffe7f3e2fe992343b8c Mon Sep 17 00:00:00 2001 From: Marcin Kuthan Date: Wed, 23 Nov 2022 16:23:48 +0100 Subject: [PATCH 04/10] fix --- .github/workflows/lighthouse-report.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/lighthouse-report.yml b/.github/workflows/lighthouse-report.yml index d7fc66710..228d4dd85 100644 --- a/.github/workflows/lighthouse-report.yml +++ b/.github/workflows/lighthouse-report.yml @@ -20,3 +20,5 @@ jobs: - uses: ./.github/actions/setup - run: npm run build - uses: treosh/lighthouse-ci-action@v9 + with: + uploadArtifacts: true From 84f4050983365ff3d4cfaa8bfaec5348dd0fc393 Mon Sep 17 00:00:00 2001 From: Marcin Kuthan Date: Wed, 23 Nov 2022 16:25:16 +0100 Subject: [PATCH 05/10] fix --- .github/workflows/lighthouse-report.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/lighthouse-report.yml b/.github/workflows/lighthouse-report.yml index 228d4dd85..5e0d6d1d4 100644 --- a/.github/workflows/lighthouse-report.yml +++ b/.github/workflows/lighthouse-report.yml @@ -22,3 +22,4 @@ jobs: - uses: treosh/lighthouse-ci-action@v9 with: uploadArtifacts: true + temporaryPublicStorage: true From 96216415064f5b08f4fc21f59b13d2dae7cd505a Mon Sep 17 00:00:00 2001 From: Marcin Kuthan Date: Wed, 23 Nov 2022 16:40:41 +0100 Subject: [PATCH 06/10] fix --- .github/workflows/lighthouse-report.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/lighthouse-report.yml b/.github/workflows/lighthouse-report.yml index 5e0d6d1d4..77fe430ec 100644 --- a/.github/workflows/lighthouse-report.yml +++ b/.github/workflows/lighthouse-report.yml @@ -20,6 +20,19 @@ jobs: - uses: ./.github/actions/setup - run: npm run build - uses: treosh/lighthouse-ci-action@v9 + id: lighthouse with: uploadArtifacts: true temporaryPublicStorage: true + - uses: actions/github-script@v6 + env: + with: + script: | + const lighthouse_links = ${{ steps.lighthouse.outputs.links }} + const lighthouse_link = Object.values(lighthouse_links)[0] + github.rest.issues.createComment({ + issue_number: context.issue.number, + owner: context.repo.owner, + repo: context.repo.repo, + body: ':stopwatch: Lighthouse [report](' + lighthouse_link + ')' + }) From 3dd8757c9ec1e9ef50fe3b8ca41ae695f0eafdf3 Mon Sep 17 00:00:00 2001 From: Marcin Kuthan Date: Wed, 23 Nov 2022 16:42:04 +0100 Subject: [PATCH 07/10] fix --- .github/workflows/lighthouse-report.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/lighthouse-report.yml b/.github/workflows/lighthouse-report.yml index 77fe430ec..c354de70a 100644 --- a/.github/workflows/lighthouse-report.yml +++ b/.github/workflows/lighthouse-report.yml @@ -25,7 +25,6 @@ jobs: uploadArtifacts: true temporaryPublicStorage: true - uses: actions/github-script@v6 - env: with: script: | const lighthouse_links = ${{ steps.lighthouse.outputs.links }} From 8f623b99a0124fe21e7b2b049010f6efd1cce697 Mon Sep 17 00:00:00 2001 From: Marcin Kuthan Date: Wed, 23 Nov 2022 16:52:49 +0100 Subject: [PATCH 08/10] fix --- .github/workflows/ci.yml | 107 +++++++++--------- .../{lighthouse-report.yml => reports.yml} | 19 +++- .github/workflows/size-report.yml | 21 ---- 3 files changed, 68 insertions(+), 79 deletions(-) rename .github/workflows/{lighthouse-report.yml => reports.yml} (72%) delete mode 100644 .github/workflows/size-report.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 06126ead8..14d7fd8db 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,61 +12,56 @@ concurrency: cancel-in-progress: true jobs: -# lint: -# runs-on: ubuntu-latest -# -# steps: -# - uses: actions/checkout@v3 -# - uses: ./.github/actions/setup -# - run: npm run lint -# -# unit-test: -# runs-on: ubuntu-latest -# -# strategy: -# matrix: -# node-version: [14.20.0, 16.15.0] -# -# steps: -# - uses: actions/checkout@v3 -# - uses: ./.github/actions/setup -# with: -# node-version: ${{ matrix.node-version }} -# - run: npm run build -# - run: npm run test -# -# e2e-test: -# runs-on: ubuntu-latest -# -# strategy: -# matrix: -# node-version: [14.20.0, 16.15.0] -# -# steps: -# - uses: actions/checkout@v3 -# - uses: ./.github/actions/setup -# with: -# node-version: ${{ matrix.node-version }} -# - run: npm run build -# - run: npm run e2e -# -# required-checks: -# needs: [lint, unit-test, e2e-test] -# runs-on: ubuntu-latest -# steps: -# - run: exit 0 -# -# deploy: -# needs: required-checks -# uses: ./.github/workflows/deploy.yml -# secrets: inherit -# - lighthouse-report: -# needs: required-checks - uses: ./.github/workflows/lighthouse-report.yml + lint: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - uses: ./.github/actions/setup + - run: npm run lint + + unit-test: + runs-on: ubuntu-latest + + strategy: + matrix: + node-version: [14.20.0, 16.15.0] + + steps: + - uses: actions/checkout@v3 + - uses: ./.github/actions/setup + with: + node-version: ${{ matrix.node-version }} + - run: npm run build + - run: npm run test + + e2e-test: + runs-on: ubuntu-latest + + strategy: + matrix: + node-version: [14.20.0, 16.15.0] + + steps: + - uses: actions/checkout@v3 + - uses: ./.github/actions/setup + with: + node-version: ${{ matrix.node-version }} + - run: npm run build + - run: npm run e2e + + required-checks: + needs: [lint, unit-test, e2e-test] + runs-on: ubuntu-latest + steps: + - run: exit 0 + + deploy: + needs: required-checks + uses: ./.github/workflows/deploy.yml secrets: inherit -# size-report: -# needs: required-checks -# uses: ./.github/workflows/size-report.yml -# secrets: inherit + reports: + needs: required-checks + uses: ./.github/workflows/reports.yml + secrets: inherit diff --git a/.github/workflows/lighthouse-report.yml b/.github/workflows/reports.yml similarity index 72% rename from .github/workflows/lighthouse-report.yml rename to .github/workflows/reports.yml index c354de70a..6f4f7a328 100644 --- a/.github/workflows/lighthouse-report.yml +++ b/.github/workflows/reports.yml @@ -1,11 +1,26 @@ -name: Lighthouse Report +name: Reports on: workflow_call: ~ workflow_dispatch: ~ jobs: - lighthouse-report: + size-report: + runs-on: ubuntu-latest + + if: github.event_name == 'pull_request' + + steps: + - uses: actions/checkout@v3 + - uses: ./.github/actions/setup + + - uses: andresz1/size-limit-action@v1 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + build_script: build:client + skip_step: install + + lighthouse: runs-on: ubuntu-latest if: github.event_name == 'pull_request' diff --git a/.github/workflows/size-report.yml b/.github/workflows/size-report.yml deleted file mode 100644 index 9a3b3b0b0..000000000 --- a/.github/workflows/size-report.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Size report - -on: - workflow_call: ~ - workflow_dispatch: ~ - -jobs: - size-report: - runs-on: ubuntu-latest - - if: github.event_name == 'pull_request' - - steps: - - uses: actions/checkout@v3 - - uses: ./.github/actions/setup - - - uses: andresz1/size-limit-action@v1 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - build_script: build:client - skip_step: install From ae2cc43fe74ddb0f076ebe3b0c65e79095bb9e3b Mon Sep 17 00:00:00 2001 From: Marcin Kuthan Date: Wed, 23 Nov 2022 16:53:13 +0100 Subject: [PATCH 09/10] fix --- .github/workflows/reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 6f4f7a328..e5c2efe29 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -25,7 +25,7 @@ jobs: if: github.event_name == 'pull_request' - # add permission to comment PR created by dependantbot + # add permission to comment PR created by dependabot permissions: issues: write pull-requests: write From 765d287de7e856d0c244f86a613d83a6dcf9524c Mon Sep 17 00:00:00 2001 From: Marcin Kuthan Date: Wed, 23 Nov 2022 16:54:33 +0100 Subject: [PATCH 10/10] fix --- .github/workflows/reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index e5c2efe29..5b85c9119 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -5,7 +5,7 @@ on: workflow_dispatch: ~ jobs: - size-report: + size: runs-on: ubuntu-latest if: github.event_name == 'pull_request'