Skip to content

Commit e949f77

Browse files
devversiondevversion
committed
build: follow-up fixes to fix CI errors
Follow-up fixes to fix CI errors in `main`.
1 parent 462829b commit e949f77

6 files changed

Lines changed: 64 additions & 26 deletions

File tree

‎.github/workflows/ci.material-aio.yml‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ defaults:
1818
run:
1919
shell: bash
2020

21-
env:
22-
# TODO: Remove when pnpm is exclusively used.
23-
ASPECT_RULES_JS_FROZEN_PNPM_LOCK: '1'
24-
2521
jobs:
2622
lint:
2723
runs-on: ubuntu-latest
2824
steps:
2925
- name: Initialize environment
3026
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@e4bf37af223483ce00f9316d227fd62cd744dc4b
27+
- name: Setup Bazel
28+
uses: angular/dev-infra/github-actions/bazel/setup@e4bf37af223483ce00f9316d227fd62cd744dc4b
29+
- name: Setup Bazel RBE
30+
uses: angular/dev-infra/github-actions/bazel/configure-remote@e4bf37af223483ce00f9316d227fd62cd744dc4
3131
- name: Install node modules
3232
run: pnpm install --frozen-lockfile
3333
- name: Execute Linting
@@ -38,18 +38,24 @@ jobs:
3838
steps:
3939
- name: Initialize environment
4040
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@e4bf37af223483ce00f9316d227fd62cd744dc4b
41+
- name: Setup Bazel
42+
uses: angular/dev-infra/github-actions/bazel/setup@e4bf37af223483ce00f9316d227fd62cd744dc4b
43+
- name: Setup Bazel RBE
44+
uses: angular/dev-infra/github-actions/bazel/configure-remote@e4bf37af223483ce00f9316d227fd62cd744dc4
4145
- name: Install node modules
4246
run: pnpm install --frozen-lockfile
43-
- name: Execute Direct Production Build (deploy usage)
44-
run: pnpm -s --cwd=docs prod-build
45-
- name: Execute Build via Bazel
47+
- name: Execute Build
4648
run: pnpm -s --cwd=docs bazel build //...
4749

4850
test:
4951
runs-on: ubuntu-latest
5052
steps:
5153
- name: Initialize environment
5254
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@e4bf37af223483ce00f9316d227fd62cd744dc4b
55+
- name: Setup Bazel
56+
uses: angular/dev-infra/github-actions/bazel/setup@e4bf37af223483ce00f9316d227fd62cd744dc4b
57+
- name: Setup Bazel RBE
58+
uses: angular/dev-infra/github-actions/bazel/configure-remote@e4bf37af223483ce00f9316d227fd62cd744dc4
5359
- name: Install node modules
5460
run: pnpm install --frozen-lockfile
5561
- name: Execute Tests
@@ -67,6 +73,10 @@ jobs:
6773
steps:
6874
- name: Initialize environment
6975
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@e4bf37af223483ce00f9316d227fd62cd744dc4b
76+
- name: Setup Bazel
77+
uses: angular/dev-infra/github-actions/bazel/setup@e4bf37af223483ce00f9316d227fd62cd744dc4b
78+
- name: Setup Bazel RBE
79+
uses: angular/dev-infra/github-actions/bazel/configure-remote@e4bf37af223483ce00f9316d227fd62cd744dc4
7080
- name: Install node modules
7181
run: pnpm install --frozen-lockfile
7282
- name: Execute Lighthouse Audit

‎.github/workflows/ci.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,6 @@ jobs:
183183
run: pnpm install --frozen-lockfile
184184
- name: Run tests
185185
run: bazel test --build_tag_filters=-e2e --test_tag_filters=-e2e --build_tests_only -- src/...
186-
env:
187-
ASPECT_RULES_JS_FROZEN_PNPM_LOCK: '1'
188186
- uses: ./.github/actions/slack
189187
if: failure()
190188
with:

‎.github/workflows/pr.material-aio.yml‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: 'CI (material.angular.io)'
1+
name: 'PR (material.angular.io)'
22

33
on:
44
pull_request:
@@ -16,16 +16,16 @@ defaults:
1616
run:
1717
shell: bash
1818

19-
env:
20-
# TODO: Remove when pnpm is exclusively used.
21-
ASPECT_RULES_JS_FROZEN_PNPM_LOCK: '1'
22-
2319
jobs:
2420
lint:
2521
runs-on: ubuntu-latest
2622
steps:
2723
- name: Initialize environment
2824
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@e4bf37af223483ce00f9316d227fd62cd744dc4b
25+
- name: Setup Bazel
26+
uses: angular/dev-infra/github-actions/bazel/setup@e4bf37af223483ce00f9316d227fd62cd744dc4b
27+
- name: Setup Bazel RBE
28+
uses: angular/dev-infra/github-actions/bazel/configure-remote@e4bf37af223483ce00f9316d227fd62cd744dc4
2929
- name: Install node modules
3030
run: pnpm install --frozen-lockfile
3131
- name: Execute Linting
@@ -36,6 +36,10 @@ jobs:
3636
steps:
3737
- name: Initialize environment
3838
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@e4bf37af223483ce00f9316d227fd62cd744dc4b
39+
- name: Setup Bazel
40+
uses: angular/dev-infra/github-actions/bazel/setup@e4bf37af223483ce00f9316d227fd62cd744dc4b
41+
- name: Setup Bazel RBE
42+
uses: angular/dev-infra/github-actions/bazel/configure-remote@e4bf37af223483ce00f9316d227fd62cd744dc4
3943
- name: Install node modules
4044
run: pnpm install --frozen-lockfile
4145
- name: Execute Build
@@ -46,6 +50,10 @@ jobs:
4650
steps:
4751
- name: Initialize environment
4852
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@e4bf37af223483ce00f9316d227fd62cd744dc4b
53+
- name: Setup Bazel
54+
uses: angular/dev-infra/github-actions/bazel/setup@e4bf37af223483ce00f9316d227fd62cd744dc4b
55+
- name: Setup Bazel RBE
56+
uses: angular/dev-infra/github-actions/bazel/configure-remote@e4bf37af223483ce00f9316d227fd62cd744dc4
4957
- name: Install node modules
5058
run: pnpm install --frozen-lockfile
5159
- name: Execute Tests
@@ -63,6 +71,10 @@ jobs:
6371
steps:
6472
- name: Initialize environment
6573
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@e4bf37af223483ce00f9316d227fd62cd744dc4b
74+
- name: Setup Bazel
75+
uses: angular/dev-infra/github-actions/bazel/setup@e4bf37af223483ce00f9316d227fd62cd744dc4b
76+
- name: Setup Bazel RBE
77+
uses: angular/dev-infra/github-actions/bazel/configure-remote@e4bf37af223483ce00f9316d227fd62cd744dc4
6678
- name: Install node modules
6779
run: pnpm install --frozen-lockfile
6880
- name: Execute Lighthouse Audit

‎.github/workflows/pr.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,6 @@ jobs:
146146
run: pnpm install --frozen-lockfile
147147
- name: Run tests
148148
run: bazel test --build_tag_filters=-e2e --test_tag_filters=-e2e --build_tests_only -- src/...
149-
env:
150-
ASPECT_RULES_JS_FROZEN_PNPM_LOCK: '1'
151149

152150
build:
153151
runs-on: ubuntu-latest-16core

‎docs/BUILD.bazel‎

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin")
2-
load("@aspect_rules_js//js:defs.bzl", "js_test")
2+
load("@aspect_rules_js//js:defs.bzl", "js_binary", "js_library", "js_test")
33
load("@npm2//:defs.bzl", "npm_link_all_packages")
44
load("//docs:defs.bzl", "ng_app")
55

@@ -46,21 +46,43 @@ ng_app(
4646
],
4747
)
4848

49-
js_test(
50-
name = "audit",
51-
args = [
52-
"$(location //docs:build.production)",
49+
js_library(
50+
name = "audit_lib",
51+
srcs = [
52+
"tools/audit-docs.js",
53+
"tools/lighthouse-audit.mjs",
5354
],
5455
data = [
55-
"tools/lighthouse-audit.mjs",
56-
"//docs:build.production",
5756
"//docs:node_modules/light-server",
5857
"//docs:node_modules/lighthouse",
5958
"//docs:node_modules/lighthouse-logger",
6059
"//docs:node_modules/puppeteer-core",
6160
"//docs:node_modules/shelljs",
6261
"@rules_browsers//src/browsers/chromium",
6362
],
63+
)
64+
65+
js_binary(
66+
name = "audit_tool",
67+
data = [":audit_lib"],
68+
entry_point = "tools/audit-docs.js",
69+
env = {
70+
"CHROMIUM_BIN": "$(CHROME-HEADLESS-SHELL)",
71+
},
72+
toolchains = [
73+
"@rules_browsers//src/browsers/chromium:toolchain_alias",
74+
],
75+
)
76+
77+
js_test(
78+
name = "audit",
79+
args = [
80+
"$(location //docs:build.production)",
81+
],
82+
data = [
83+
":audit_lib",
84+
"//docs:build.production",
85+
],
6486
entry_point = "tools/audit-docs.js",
6587
env = {
6688
"CHROMIUM_BIN": "$(CHROME-HEADLESS-SHELL)",

‎scripts/docs-deploy/monitoring/index.mts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ import {projectDir, sites} from '../utils.mjs';
99
* specified remote URL is properly functioning.
1010
*/
1111
export async function runMonitorTests(remoteUrl: string) {
12-
cd(path.join(projectDir, 'docs'));
13-
14-
await $`node ./tools/audit-docs.js ${remoteUrl}`;
12+
await $`pnpm bazel run //docs:audit_tool -- ${remoteUrl}`;
1513
}
1614

1715
/** Runs the monitoring tests for the stable release train. */

0 commit comments

Comments
 (0)