From 528d655a75a71027b32f6ea373a536f673ddbe51 Mon Sep 17 00:00:00 2001 From: Paul Irish Date: Thu, 19 Mar 2020 14:15:26 -0700 Subject: [PATCH 01/16] build: report to buildtracker on commit via ghactions --- .github/workflows/basics.yml | 2 +- .github/workflows/master-commit.yml | 33 +++++++++++++++++++++++++++++ build-tracker.config.js | 14 ++++++++++++ 3 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/master-commit.yml create mode 100644 build-tracker.config.js diff --git a/.github/workflows/basics.yml b/.github/workflows/basics.yml index 09863524e8bb..998af968b18d 100644 --- a/.github/workflows/basics.yml +++ b/.github/workflows/basics.yml @@ -21,7 +21,7 @@ jobs: with: node-version: 10.x - # Cache yarn deps. thx https://github.com/actions/cache/blob/master/examples.md#node---yarn + # Cache yarn deps. thx https://github.com/actions/cache/blob/master/examples.md#node---yarn - name: Get yarn cache directory path id: yarn-cache-dir-path run: echo "::set-output name=dir::$(yarn cache dir)" diff --git a/.github/workflows/master-commit.yml b/.github/workflows/master-commit.yml new file mode 100644 index 000000000000..1cad26198998 --- /dev/null +++ b/.github/workflows/master-commit.yml @@ -0,0 +1,33 @@ +# Workflow that only runs when a commit lands on master. + +name: 🛬 + +on: + push: + branches: + - master + +jobs: + # This job could be renamed more generically if we add other steps in here + buildtracker: + + runs-on: ubuntu-latest + + steps: + - name: git clone + uses: actions/checkout@v2 + + - name: Use Node.js 10.x + uses: actions/setup-node@v1 + with: + node-version: 10.x + + - run: yarn --frozen-lockfile + - run: yarn build-all + + - name: Store in buildtracker + - uses: paularmstrong/build-tracker-action@master + with: + # https://buildtracker.dev/docs/guides/github-actions#configuration + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + BT_API_AUTH_TOKEN: ${{ secrets.BT_API_AUTH_TOKEN }} diff --git a/build-tracker.config.js b/build-tracker.config.js new file mode 100644 index 000000000000..a35adce734f7 --- /dev/null +++ b/build-tracker.config.js @@ -0,0 +1,14 @@ +// https://buildtracker.dev/docs/installation/#upload-your-builds + +module.exports = { + applicationUrl: 'https://lh-build-tracker.herokuapp.com', + artifacts: [ + "dist/lightrider/lighthouse-lr-bundle.js", + "dist/extension/scripts/lighthouse-ext-bundle.js", + "dist/lighthouse-dt-bundle.js", + "dist/viewer/src/viewer.js", + "dist/lightrider/report-generator-bundle.js", + "dist/dt-report-resources/report.js", + "dist/dt-report-resources/report-generator.js", + ] +}; From 1f6ceac0fae80cf3aa53f7b0a474e4b7fe1dcd59 Mon Sep 17 00:00:00 2001 From: Paul Irish Date: Thu, 19 Mar 2020 14:22:35 -0700 Subject: [PATCH 02/16] lint --- build-tracker.config.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/build-tracker.config.js b/build-tracker.config.js index a35adce734f7..938323199049 100644 --- a/build-tracker.config.js +++ b/build-tracker.config.js @@ -1,14 +1,16 @@ // https://buildtracker.dev/docs/installation/#upload-your-builds +"use strict"; + module.exports = { applicationUrl: 'https://lh-build-tracker.herokuapp.com', artifacts: [ - "dist/lightrider/lighthouse-lr-bundle.js", - "dist/extension/scripts/lighthouse-ext-bundle.js", - "dist/lighthouse-dt-bundle.js", - "dist/viewer/src/viewer.js", - "dist/lightrider/report-generator-bundle.js", - "dist/dt-report-resources/report.js", - "dist/dt-report-resources/report-generator.js", - ] + 'dist/lightrider/lighthouse-lr-bundle.js', + 'dist/extension/scripts/lighthouse-ext-bundle.js', + 'dist/lighthouse-dt-bundle.js', + 'dist/viewer/src/viewer.js', + 'dist/lightrider/report-generator-bundle.js', + 'dist/dt-report-resources/report.js', + 'dist/dt-report-resources/report-generator.js', + ], }; From 9cebb718b4cba6928bd1086cf0236e4a5fb14672 Mon Sep 17 00:00:00 2001 From: Paul Irish Date: Thu, 19 Mar 2020 14:23:25 -0700 Subject: [PATCH 03/16] workflow syntax --- .github/workflows/master-commit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/master-commit.yml b/.github/workflows/master-commit.yml index 1cad26198998..8e0bd7390575 100644 --- a/.github/workflows/master-commit.yml +++ b/.github/workflows/master-commit.yml @@ -26,7 +26,7 @@ jobs: - run: yarn build-all - name: Store in buildtracker - - uses: paularmstrong/build-tracker-action@master + uses: paularmstrong/build-tracker-action@master with: # https://buildtracker.dev/docs/guides/github-actions#configuration GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 55578fec8eeae221cda959f1c8c7c9df785ab5f8 Mon Sep 17 00:00:00 2001 From: Paul Irish Date: Thu, 19 Mar 2020 14:27:20 -0700 Subject: [PATCH 04/16] lint --- .github/workflows/basics.yml | 3 +++ build-tracker.config.js | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/basics.yml b/.github/workflows/basics.yml index 998af968b18d..54a494781751 100644 --- a/.github/workflows/basics.yml +++ b/.github/workflows/basics.yml @@ -11,6 +11,9 @@ jobs: basics: runs-on: ubuntu-latest + strategy: + # e.g. if lint fails, continue to the unit tests anyway + fail-fast: false steps: - name: git clone diff --git a/build-tracker.config.js b/build-tracker.config.js index 938323199049..62e3f07d23e0 100644 --- a/build-tracker.config.js +++ b/build-tracker.config.js @@ -1,6 +1,6 @@ // https://buildtracker.dev/docs/installation/#upload-your-builds -"use strict"; +'use strict'; module.exports = { applicationUrl: 'https://lh-build-tracker.herokuapp.com', From 9ed746b2eda8188b9fc9d6301b8a379811fa6ffc Mon Sep 17 00:00:00 2001 From: Paul Irish Date: Mon, 6 Apr 2020 11:43:48 -0700 Subject: [PATCH 05/16] rename and also run on PR --- .github/workflows/{master-commit.yml => buildtracker.yml} | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) rename .github/workflows/{master-commit.yml => buildtracker.yml} (95%) diff --git a/.github/workflows/master-commit.yml b/.github/workflows/buildtracker.yml similarity index 95% rename from .github/workflows/master-commit.yml rename to .github/workflows/buildtracker.yml index 8e0bd7390575..07eb5191d87a 100644 --- a/.github/workflows/master-commit.yml +++ b/.github/workflows/buildtracker.yml @@ -1,11 +1,12 @@ # Workflow that only runs when a commit lands on master. -name: 🛬 +name: 👷‍♀️ on: push: branches: - master + pull_request jobs: # This job could be renamed more generically if we add other steps in here From a2c941e609e23521019ea1ca86f30c9222760b5d Mon Sep 17 00:00:00 2001 From: Paul Irish Date: Mon, 6 Apr 2020 11:48:10 -0700 Subject: [PATCH 06/16] colon --- .github/workflows/buildtracker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildtracker.yml b/.github/workflows/buildtracker.yml index 07eb5191d87a..b5d994f83ade 100644 --- a/.github/workflows/buildtracker.yml +++ b/.github/workflows/buildtracker.yml @@ -6,7 +6,7 @@ on: push: branches: - master - pull_request + pull_request: jobs: # This job could be renamed more generically if we add other steps in here From 8e0312b7b4e792bd8f1a28cd77944ca0322c9f47 Mon Sep 17 00:00:00 2001 From: Paul Irish Date: Mon, 6 Apr 2020 11:53:10 -0700 Subject: [PATCH 07/16] comment --- .github/workflows/buildtracker.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/buildtracker.yml b/.github/workflows/buildtracker.yml index b5d994f83ade..b7870f13f573 100644 --- a/.github/workflows/buildtracker.yml +++ b/.github/workflows/buildtracker.yml @@ -9,7 +9,6 @@ on: pull_request: jobs: - # This job could be renamed more generically if we add other steps in here buildtracker: runs-on: ubuntu-latest From 09306f4ab8c0e2f93a68167026da545d5e024a7e Mon Sep 17 00:00:00 2001 From: Paul Irish Date: Mon, 6 Apr 2020 12:15:35 -0700 Subject: [PATCH 08/16] disable on PR. run with basic CLI --- .github/workflows/buildtracker.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/buildtracker.yml b/.github/workflows/buildtracker.yml index b7870f13f573..91fbad102eae 100644 --- a/.github/workflows/buildtracker.yml +++ b/.github/workflows/buildtracker.yml @@ -6,7 +6,8 @@ on: push: branches: - master - pull_request: + # running on PRs disabled until we can disable the comments. https://github.com/paularmstrong/build-tracker-action/issues/3 + # pull_request: jobs: buildtracker: @@ -26,8 +27,8 @@ jobs: - run: yarn build-all - name: Store in buildtracker - uses: paularmstrong/build-tracker-action@master - with: + run: yarn bt-cli upload-build + env: # https://buildtracker.dev/docs/guides/github-actions#configuration GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} BT_API_AUTH_TOKEN: ${{ secrets.BT_API_AUTH_TOKEN }} From b752d74de2e17d4e8bf5d002e5fddd2f174d35e2 Mon Sep 17 00:00:00 2001 From: Paul Irish Date: Mon, 6 Apr 2020 12:16:15 -0700 Subject: [PATCH 09/16] add build-tracker to devdeps --- package.json | 1 + yarn.lock | 204 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 202 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index f05bea6b01bc..04e2bb5148a6 100644 --- a/package.json +++ b/package.json @@ -74,6 +74,7 @@ "static-server": "node lighthouse-cli/test/fixtures/static-server.js" }, "devDependencies": { + "@build-tracker/cli": "^1.0.0-beta.14", "@firebase/app-types": "0.3.1", "@firebase/auth-types": "0.3.2", "@firebase/util": "0.2.1", diff --git a/yarn.lock b/yarn.lock index 2a3ef73015ed..772ca87ce241 100644 --- a/yarn.lock +++ b/yarn.lock @@ -131,6 +131,32 @@ lodash "^4.17.11" to-fast-properties "^2.0.0" +"@build-tracker/api-client@^1.0.0-beta.14": + version "1.0.0-beta.14" + resolved "https://registry.yarnpkg.com/@build-tracker/api-client/-/api-client-1.0.0-beta.14.tgz#30032bbeba4757d10806437b439215fabae5e3b4" + integrity sha512-maVXOHw3hq+DoZpp8NAc1ougBkNasSW+jfh+e51G6/N5oDqk8n2DmEuQFvqPEvx8DEExKprr0etsRgjyniWDGA== + dependencies: + "@types/cosmiconfig" "^5.0.3" + "@types/glob" "^7.1.1" + "@types/node" "^11.10.4" + "@types/yargs" "^15.0.0" + brotli-size "^4.0.0" + cosmiconfig "^5.1.0" + glob "^7.1.3" + gzip-size "^5.0.0" + path-to-regexp "3.0.0" + yargs "^15.0.0" + +"@build-tracker/cli@^1.0.0-beta.14": + version "1.0.0-beta.14" + resolved "https://registry.yarnpkg.com/@build-tracker/cli/-/cli-1.0.0-beta.14.tgz#4ab9be8f86bdc53295b2ef02f0983b80f14d700e" + integrity sha512-DCEHth2qZSzQAHE2gO1I0YerXt2ApU921Hie81Qjvm5ksEfWIUXZeK74SEs/RZbRUK02L9FYHje3FVEFFWJFBg== + dependencies: + "@build-tracker/api-client" "^1.0.0-beta.14" + "@types/node" "^11.10.4" + "@types/yargs" "^15.0.0" + yargs "^15.0.0" + "@cnakazawa/watch@^1.0.3": version "1.0.3" resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef" @@ -431,11 +457,23 @@ dependencies: "@types/filesystem" "*" +"@types/color-name@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" + integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== + "@types/configstore@^2.1.1": version "2.1.1" resolved "https://registry.yarnpkg.com/@types/configstore/-/configstore-2.1.1.tgz#cd1e8553633ad3185c3f2f239ecff5d2643e92b6" integrity sha1-zR6FU2M60xhcPy8jns/10mQ+krY= +"@types/cosmiconfig@^5.0.3": + version "5.0.3" + resolved "https://registry.yarnpkg.com/@types/cosmiconfig/-/cosmiconfig-5.0.3.tgz#880644bb155d4038d3b752159684b777b0a159dd" + integrity sha512-HgTGG7X5y9pLl3pixeo2XtDEFD8rq2EuH+S4mK6teCnAwWMucQl6v1D43hI4Uw1VJh6nu59lxLkqXHRl4uwThA== + dependencies: + "@types/node" "*" + "@types/cp-file@*": version "4.2.0" resolved "https://registry.yarnpkg.com/@types/cp-file/-/cp-file-4.2.0.tgz#2b12186b50dad407b11021284627bdf4adb87a87" @@ -489,7 +527,7 @@ resolved "https://registry.yarnpkg.com/@types/gh-pages/-/gh-pages-2.0.0.tgz#a38a9b76bc9a5ed1e3f207321df003b2e5164f63" integrity sha512-nv697/tjlju4YlRZRc38rBTeABgnI+ZIFX1Kh9Q1QYBpq8QDSwMRnDMJMye2piRjrqJStTEYKQhjEWZ+0TG3lw== -"@types/glob@*": +"@types/glob@*", "@types/glob@^7.1.1": version "7.1.1" resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575" integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w== @@ -605,6 +643,11 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.0.tgz#1c297530428c6f4e0a0a3222f5b44745669aa9f7" integrity sha512-1UhSMMDix7bVdUeqtZERQQyJr3QuFoN5X5APtpIooGkumE3crPaeq7UgFeJNjGD8yCQ8od8PzRkgptR5+x327Q== +"@types/node@^11.10.4": + version "11.15.9" + resolved "https://registry.yarnpkg.com/@types/node/-/node-11.15.9.tgz#656b2f61ebe6af278769dfc24e6ab00528a373eb" + integrity sha512-NcOiyA/gxMAounNa4IPm/e13kYqU48onEarMnbLzz3ynEdlxFKYFoBbMBSefAHJR77r9MCtD88J0Z2TVtNsBbw== + "@types/raven@^2.5.1": version "2.5.1" resolved "https://registry.yarnpkg.com/@types/raven/-/raven-2.5.1.tgz#62ef0a59e29691945e1f295b62ed199619cbd9b6" @@ -769,6 +812,13 @@ dependencies: "@types/yargs-parser" "*" +"@types/yargs@^15.0.0": + version "15.0.4" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.4.tgz#7e5d0f8ca25e9d5849f2ea443cf7c402decd8299" + integrity sha512-9T1auFmbPZoxHz0enUFlUuKRy3it01R+hlggyVUMtnCTQRunsQYifnSGb8hET4Xo8yiC0o0r1paW3ud5+rbURg== + dependencies: + "@types/yargs-parser" "*" + "@types/yargs@^8.0.2": version "8.0.2" resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-8.0.2.tgz#0f9c7b236e2d78cd8f4b6502de15d0728aa29385" @@ -931,6 +981,11 @@ ansi-regex@^4.1.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== +ansi-regex@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" + integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== + ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" @@ -943,6 +998,14 @@ ansi-styles@^3.1.0, ansi-styles@^3.2.0, ansi-styles@^3.2.1: dependencies: color-convert "^1.9.0" +ansi-styles@^4.0.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359" + integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA== + dependencies: + "@types/color-name" "^1.1.1" + color-convert "^2.0.1" + anymatch@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" @@ -1458,6 +1521,13 @@ brotli-size@0.1.0: duplexer "^0.1.1" iltorb "^2.4.3" +brotli-size@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/brotli-size/-/brotli-size-4.0.0.tgz#a05ee3faad3c0e700a2f2da826ba6b4d76e69e5e" + integrity sha512-uA9fOtlTRC0iqKfzff1W34DXUA3GyVqbUaeo3Rw3d4gd1eavKVCETXrn3NzO74W+UVkG3UHu8WxUi+XvKI/huA== + dependencies: + duplexer "0.1.1" + browser-pack@^6.0.1: version "6.1.0" resolved "https://registry.yarnpkg.com/browser-pack/-/browser-pack-6.1.0.tgz#c34ba10d0b9ce162b5af227c7131c92c2ecd5774" @@ -1934,6 +2004,15 @@ cliui@^5.0.0: strip-ansi "^5.2.0" wrap-ansi "^5.1.0" +cliui@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1" + integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^6.2.0" + co@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" @@ -1970,11 +2049,23 @@ color-convert@^1.9.0: dependencies: color-name "1.1.3" +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + color-name@1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + colors@1.0.x: version "1.0.3" resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" @@ -2264,7 +2355,7 @@ core-util-is@~1.0.0: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= -cosmiconfig@^5.2.1: +cosmiconfig@^5.1.0, cosmiconfig@^5.2.1: version "5.2.1" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a" integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA== @@ -2758,7 +2849,7 @@ duplexer3@^0.1.4: resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= -duplexer@^0.1.1: +duplexer@0.1.1, duplexer@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1" integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E= @@ -2798,6 +2889,11 @@ emoji-regex@^7.0.1: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== + encoding@^0.1.11: version "0.1.12" resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb" @@ -3345,6 +3441,14 @@ find-up@^3.0.0: dependencies: locate-path "^3.0.0" +find-up@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + first-chunk-stream@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e" @@ -3714,6 +3818,14 @@ gzip-size@^4.0.0: duplexer "^0.1.1" pify "^3.0.0" +gzip-size@^5.0.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz#cb9bee692f87c0612b232840a873904e4c135274" + integrity sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA== + dependencies: + duplexer "^0.1.1" + pify "^4.0.1" + handlebars@^4.0.2, handlebars@^4.1.0: version "4.1.2" resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz#b6b37c1ced0306b221e094fc7aca3ec23b131b67" @@ -4265,6 +4377,11 @@ is-fullwidth-code-point@^2.0.0: resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + is-generator-fn@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.0.0.tgz#038c31b774709641bda678b1f06a4e3227c10b3e" @@ -5228,6 +5345,13 @@ locate-path@^3.0.0: p-locate "^3.0.0" path-exists "^3.0.0" +locate-path@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== + dependencies: + p-locate "^4.1.0" + lodash._reinterpolate@^3.0.0, lodash._reinterpolate@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" @@ -6065,6 +6189,13 @@ p-limit@^2.0.0: dependencies: p-try "^2.0.0" +p-limit@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== + dependencies: + p-try "^2.0.0" + p-locate@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" @@ -6072,6 +6203,13 @@ p-locate@^3.0.0: dependencies: p-limit "^2.0.0" +p-locate@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== + dependencies: + p-limit "^2.2.0" + p-reduce@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa" @@ -6195,6 +6333,11 @@ path-exists@^3.0.0: resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== + path-is-absolute@^1.0.0, path-is-absolute@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" @@ -6220,6 +6363,11 @@ path-platform@~0.11.15: resolved "https://registry.yarnpkg.com/path-platform/-/path-platform-0.11.15.tgz#e864217f74c36850f0852b78dc7bf7d4a5721bf2" integrity sha1-6GQhf3TDaFDwhSt43Hv31KVyG/I= +path-to-regexp@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-3.0.0.tgz#c981a218f3df543fa28696be2f88e0c58d2e012a" + integrity sha512-ZOtfhPttCrqp2M1PBBH4X13XlvnfhIwD7yCLx+GoGoXRPQyxGOTdQMpIzPSPKXAJT/JQrdfFrgdJOyAzvgpQ9A== + path-type@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441" @@ -7383,6 +7531,15 @@ string-width@^3.0.0, string-width@^3.1.0: is-fullwidth-code-point "^2.0.0" strip-ansi "^5.1.0" +string-width@^4.1.0, string-width@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" + integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.0" + string_decoder@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d" @@ -7425,6 +7582,13 @@ strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" +strip-ansi@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" + integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== + dependencies: + ansi-regex "^5.0.0" + strip-bom@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-1.0.0.tgz#85b8862f3844b5a6d5ec8467a93598173a36f794" @@ -8164,6 +8328,15 @@ wrap-ansi@^5.1.0: string-width "^3.0.0" strip-ansi "^5.0.0" +wrap-ansi@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" + integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" @@ -8291,6 +8464,14 @@ yargs-parser@^13.1.1: camelcase "^5.0.0" decamelize "^1.2.0" +yargs-parser@^18.1.1: + version "18.1.2" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.2.tgz#2f482bea2136dbde0861683abea7756d30b504f1" + integrity sha512-hlIPNR3IzC1YuL1c2UwwDKpXlNFBqD1Fswwh1khz5+d8Cq/8yc/Mn0i+rQXduu8hcrFKvO7Eryk+09NecTQAAQ== + dependencies: + camelcase "^5.0.0" + decamelize "^1.2.0" + yargs@3.32.0: version "3.32.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995" @@ -8338,6 +8519,23 @@ yargs@^13.3.0: y18n "^4.0.0" yargs-parser "^13.1.1" +yargs@^15.0.0: + version "15.3.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz#9505b472763963e54afe60148ad27a330818e98b" + integrity sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA== + dependencies: + cliui "^6.0.0" + decamelize "^1.2.0" + find-up "^4.1.0" + get-caller-file "^2.0.1" + require-directory "^2.1.1" + require-main-filename "^2.0.0" + set-blocking "^2.0.0" + string-width "^4.2.0" + which-module "^2.0.0" + y18n "^4.0.0" + yargs-parser "^18.1.1" + yauzl@2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005" From ff928218c32c97b16f9da4f2ffbac76b401e6a81 Mon Sep 17 00:00:00 2001 From: Paul Irish Date: Mon, 6 Apr 2020 12:38:28 -0700 Subject: [PATCH 10/16] run on PRs --- .github/workflows/buildtracker.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/buildtracker.yml b/.github/workflows/buildtracker.yml index 91fbad102eae..c5ffde204b68 100644 --- a/.github/workflows/buildtracker.yml +++ b/.github/workflows/buildtracker.yml @@ -6,8 +6,7 @@ on: push: branches: - master - # running on PRs disabled until we can disable the comments. https://github.com/paularmstrong/build-tracker-action/issues/3 - # pull_request: + pull_request: jobs: buildtracker: From d270403c3c17f8d639ba70688165ebc6af060655 Mon Sep 17 00:00:00 2001 From: Paul Irish Date: Mon, 6 Apr 2020 12:45:41 -0700 Subject: [PATCH 11/16] revert basics changes --- .github/workflows/basics.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/basics.yml b/.github/workflows/basics.yml index 54a494781751..09863524e8bb 100644 --- a/.github/workflows/basics.yml +++ b/.github/workflows/basics.yml @@ -11,9 +11,6 @@ jobs: basics: runs-on: ubuntu-latest - strategy: - # e.g. if lint fails, continue to the unit tests anyway - fail-fast: false steps: - name: git clone @@ -24,7 +21,7 @@ jobs: with: node-version: 10.x - # Cache yarn deps. thx https://github.com/actions/cache/blob/master/examples.md#node---yarn + # Cache yarn deps. thx https://github.com/actions/cache/blob/master/examples.md#node---yarn - name: Get yarn cache directory path id: yarn-cache-dir-path run: echo "::set-output name=dir::$(yarn cache dir)" From fc0a137a555cad5b768e42e3352a964baf275e1a Mon Sep 17 00:00:00 2001 From: Paul Irish Date: Mon, 6 Apr 2020 13:04:12 -0700 Subject: [PATCH 12/16] move into basics workflow --- .github/workflows/basics.yml | 6 ++++++ .github/workflows/buildtracker.yml | 33 ------------------------------ 2 files changed, 6 insertions(+), 33 deletions(-) delete mode 100644 .github/workflows/buildtracker.yml diff --git a/.github/workflows/basics.yml b/.github/workflows/basics.yml index 09863524e8bb..5fc67def71b7 100644 --- a/.github/workflows/basics.yml +++ b/.github/workflows/basics.yml @@ -40,3 +40,9 @@ jobs: - run: yarn lint - run: yarn unit-core - run: yarn tsc -p . + + - name: Store in buildtracker + run: yarn bt-cli upload-build + env: + # https://buildtracker.dev/docs/guides/github-actions#configuration + BT_API_AUTH_TOKEN: ${{ secrets.BT_API_AUTH_TOKEN }} diff --git a/.github/workflows/buildtracker.yml b/.github/workflows/buildtracker.yml deleted file mode 100644 index c5ffde204b68..000000000000 --- a/.github/workflows/buildtracker.yml +++ /dev/null @@ -1,33 +0,0 @@ -# Workflow that only runs when a commit lands on master. - -name: 👷‍♀️ - -on: - push: - branches: - - master - pull_request: - -jobs: - buildtracker: - - runs-on: ubuntu-latest - - steps: - - name: git clone - uses: actions/checkout@v2 - - - name: Use Node.js 10.x - uses: actions/setup-node@v1 - with: - node-version: 10.x - - - run: yarn --frozen-lockfile - - run: yarn build-all - - - name: Store in buildtracker - run: yarn bt-cli upload-build - env: - # https://buildtracker.dev/docs/guides/github-actions#configuration - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - BT_API_AUTH_TOKEN: ${{ secrets.BT_API_AUTH_TOKEN }} From a99353d909f7651d92cf4cbd9a0197d818a6ac4d Mon Sep 17 00:00:00 2001 From: Paul Irish Date: Thu, 9 Apr 2020 13:54:15 -0700 Subject: [PATCH 13/16] verbose upload-build --- .github/workflows/basics.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/basics.yml b/.github/workflows/basics.yml index 5fc67def71b7..641219b8f1b6 100644 --- a/.github/workflows/basics.yml +++ b/.github/workflows/basics.yml @@ -42,7 +42,7 @@ jobs: - run: yarn tsc -p . - name: Store in buildtracker - run: yarn bt-cli upload-build + run: yarn bt-cli -vv upload-build env: # https://buildtracker.dev/docs/guides/github-actions#configuration BT_API_AUTH_TOKEN: ${{ secrets.BT_API_AUTH_TOKEN }} From 5993df8579c8407565e1a42c2389c2e3bae56078 Mon Sep 17 00:00:00 2001 From: Paul Irish Date: Tue, 14 Apr 2020 12:38:59 -0700 Subject: [PATCH 14/16] deepen clone to get a working merge-base --- .github/workflows/basics.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/basics.yml b/.github/workflows/basics.yml index 641219b8f1b6..05a0627da521 100644 --- a/.github/workflows/basics.yml +++ b/.github/workflows/basics.yml @@ -41,6 +41,9 @@ jobs: - run: yarn unit-core - run: yarn tsc -p . + # buildtracker runs `git merge-base HEAD origin/master` which needs more history than depth=1. https://github.com/paularmstrong/build-tracker/issues/106 + - name: Deepen git fetch (for buildtracker) + run: git fetch --deepen=100 - name: Store in buildtracker run: yarn bt-cli -vv upload-build env: From b64f6377527fe8d338f0df07bcbb74fef760a308 Mon Sep 17 00:00:00 2001 From: Paul Irish Date: Tue, 14 Apr 2020 13:13:18 -0700 Subject: [PATCH 15/16] drop verbose --- .github/workflows/basics.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/basics.yml b/.github/workflows/basics.yml index 05a0627da521..64219a8243ae 100644 --- a/.github/workflows/basics.yml +++ b/.github/workflows/basics.yml @@ -45,7 +45,7 @@ jobs: - name: Deepen git fetch (for buildtracker) run: git fetch --deepen=100 - name: Store in buildtracker - run: yarn bt-cli -vv upload-build + run: yarn bt-cli upload-build env: # https://buildtracker.dev/docs/guides/github-actions#configuration BT_API_AUTH_TOKEN: ${{ secrets.BT_API_AUTH_TOKEN }} From 0824186a3bd89b66416f51e65ba2927f3439ed10 Mon Sep 17 00:00:00 2001 From: Paul Irish Date: Tue, 14 Apr 2020 13:40:26 -0700 Subject: [PATCH 16/16] buildtracker version bump --- package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 04e2bb5148a6..a5e0f64c7908 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "static-server": "node lighthouse-cli/test/fixtures/static-server.js" }, "devDependencies": { - "@build-tracker/cli": "^1.0.0-beta.14", + "@build-tracker/cli": "^1.0.0-beta.15", "@firebase/app-types": "0.3.1", "@firebase/auth-types": "0.3.2", "@firebase/util": "0.2.1", diff --git a/yarn.lock b/yarn.lock index 772ca87ce241..4b220f96af34 100644 --- a/yarn.lock +++ b/yarn.lock @@ -131,10 +131,10 @@ lodash "^4.17.11" to-fast-properties "^2.0.0" -"@build-tracker/api-client@^1.0.0-beta.14": - version "1.0.0-beta.14" - resolved "https://registry.yarnpkg.com/@build-tracker/api-client/-/api-client-1.0.0-beta.14.tgz#30032bbeba4757d10806437b439215fabae5e3b4" - integrity sha512-maVXOHw3hq+DoZpp8NAc1ougBkNasSW+jfh+e51G6/N5oDqk8n2DmEuQFvqPEvx8DEExKprr0etsRgjyniWDGA== +"@build-tracker/api-client@^1.0.0-beta.15": + version "1.0.0-beta.15" + resolved "https://registry.yarnpkg.com/@build-tracker/api-client/-/api-client-1.0.0-beta.15.tgz#1de2e3f926e963fc5488e14f51555559ed6000e4" + integrity sha512-1y6BM3Nu6zhLZK8JiVScSfL0GdQLknj6BRGcgduh1FO0bBNBdd8KaTBeC4qzWAEPXQ3KLib+9EWIXF2S+qbX/Q== dependencies: "@types/cosmiconfig" "^5.0.3" "@types/glob" "^7.1.1" @@ -147,12 +147,12 @@ path-to-regexp "3.0.0" yargs "^15.0.0" -"@build-tracker/cli@^1.0.0-beta.14": - version "1.0.0-beta.14" - resolved "https://registry.yarnpkg.com/@build-tracker/cli/-/cli-1.0.0-beta.14.tgz#4ab9be8f86bdc53295b2ef02f0983b80f14d700e" - integrity sha512-DCEHth2qZSzQAHE2gO1I0YerXt2ApU921Hie81Qjvm5ksEfWIUXZeK74SEs/RZbRUK02L9FYHje3FVEFFWJFBg== +"@build-tracker/cli@^1.0.0-beta.15": + version "1.0.0-beta.15" + resolved "https://registry.yarnpkg.com/@build-tracker/cli/-/cli-1.0.0-beta.15.tgz#7a071ee36c7c80932ee494a66a1a43721b6a1e72" + integrity sha512-N+BQ6ZwOz2FtFkNqc+Aquz2A6K+2o/7Lqif5XBW5y8ScnI3qhXf9J07q+UndSMQTiwl9HC/+DrdAKTiQSw4G1A== dependencies: - "@build-tracker/api-client" "^1.0.0-beta.14" + "@build-tracker/api-client" "^1.0.0-beta.15" "@types/node" "^11.10.4" "@types/yargs" "^15.0.0" yargs "^15.0.0"