Skip to content

Commit cac7f3c

Browse files
josephperrottalan-agius4
josephperrott
authored and
alan-agius4
committed
ci: update bazel RBE setup on CI and use trusted build configuration for upstream CI runs
Update to use the latest bazel/configure-remote action from dev-infra and set up trusted builds for CI runs from upstream branches.
1 parent d556d32 commit cac7f3c

File tree

8 files changed

+52
-33
lines changed

8 files changed

+52
-33
lines changed

‎.bazelrc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,9 @@ build:remote-cache --remote_accept_cached=true
151151
build:remote-cache --remote_upload_local_results=false
152152
build:remote-cache --google_default_credentials
153153

154+
# Additional flags added when running a "trusted build" with additional access
155+
build:trusted-build --remote_upload_local_results=true
156+
154157
###############################
155158
# NodeJS rules settings
156159
# These settings are required for rules_nodejs

‎.github/shared-actions/windows-bazel-test/action.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@ inputs:
1616
runs:
1717
using: composite
1818
steps:
19-
- name: Setup Bazel RBE
20-
uses: angular/dev-infra/github-actions/bazel/configure-remote@2667d139a421977a40c3ea7ec768609fb19a8b9d
21-
with:
22-
allow_windows_rbe: true
23-
2419
- name: Initialize WSL
2520
id: init_wsl
2621
uses: angular/dev-infra/github-actions/setup-wsl@9a3e28a515bf51cd2ecfd5f4d5b17613845e6f44

‎.github/workflows/assistant-to-the-branch-manager.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ jobs:
1616
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1717
with:
1818
persist-credentials: false
19-
- uses: angular/dev-infra/github-actions/branch-manager@0ad6a370f70638e785d6ef1f90dc6ede34684a47
19+
- uses: angular/dev-infra/github-actions/branch-manager@e3c0efecadda0e0fbb616abcdf447c788959ca64
2020
with:
2121
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}

‎.github/workflows/ci.yml‎

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,11 @@ jobs:
4444
- name: Initialize environment
4545
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b79ac7f5d6689becb7f2d559affbab5afb361389
4646
- name: Setup Bazel
47-
uses: angular/dev-infra/github-actions/bazel/setup@0ad6a370f70638e785d6ef1f90dc6ede34684a47
47+
uses: angular/dev-infra/github-actions/bazel/setup@e3c0efecadda0e0fbb616abcdf447c788959ca64
4848
- name: Setup Bazel RBE
49-
uses: angular/dev-infra/github-actions/bazel/configure-remote@0ad6a370f70638e785d6ef1f90dc6ede34684a47
49+
uses: angular/dev-infra/github-actions/bazel/configure-remote@e3c0efecadda0e0fbb616abcdf447c788959ca64
50+
with:
51+
google_credential: ${{ secrets.RBE_TRUSTED_BUILDS_USER }}
5052
- name: Install node modules
5153
run: pnpm install --frozen-lockfile
5254
- name: Build release targets
@@ -59,9 +61,11 @@ jobs:
5961
- name: Initialize environment
6062
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b79ac7f5d6689becb7f2d559affbab5afb361389
6163
- name: Setup Bazel
62-
uses: angular/dev-infra/github-actions/bazel/setup@0ad6a370f70638e785d6ef1f90dc6ede34684a47
64+
uses: angular/dev-infra/github-actions/bazel/setup@e3c0efecadda0e0fbb616abcdf447c788959ca64
6365
- name: Setup Bazel RBE
64-
uses: angular/dev-infra/github-actions/bazel/configure-remote@0ad6a370f70638e785d6ef1f90dc6ede34684a47
66+
uses: angular/dev-infra/github-actions/bazel/configure-remote@e3c0efecadda0e0fbb616abcdf447c788959ca64
67+
with:
68+
google_credential: ${{ secrets.RBE_TRUSTED_BUILDS_USER }}
6569
- name: Install node modules
6670
run: pnpm install --frozen-lockfile
6771
- name: Run module and package tests
@@ -85,9 +89,11 @@ jobs:
8589
- name: Install node modules
8690
run: pnpm install --frozen-lockfile
8791
- name: Setup Bazel
88-
uses: angular/dev-infra/github-actions/bazel/setup@0ad6a370f70638e785d6ef1f90dc6ede34684a47
92+
uses: angular/dev-infra/github-actions/bazel/setup@e3c0efecadda0e0fbb616abcdf447c788959ca64
8993
- name: Setup Bazel RBE
90-
uses: angular/dev-infra/github-actions/bazel/configure-remote@0ad6a370f70638e785d6ef1f90dc6ede34684a47
94+
uses: angular/dev-infra/github-actions/bazel/configure-remote@e3c0efecadda0e0fbb616abcdf447c788959ca64
95+
with:
96+
google_credential: ${{ secrets.RBE_TRUSTED_BUILDS_USER }}
9197
- name: Run CLI E2E tests
9298
run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
9399

@@ -103,6 +109,11 @@ jobs:
103109
steps:
104110
- name: Initialize environment
105111
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b79ac7f5d6689becb7f2d559affbab5afb361389
112+
- name: Setup Bazel RBE
113+
uses: angular/dev-infra/github-actions/bazel/configure-remote@e3c0efecadda0e0fbb616abcdf447c788959ca64
114+
with:
115+
allow_windows_rbe: true
116+
google_credential: ${{ secrets.RBE_TRUSTED_BUILDS_USER }}
106117
- name: Run CLI E2E tests
107118
uses: ./.github/shared-actions/windows-bazel-test
108119
with:
@@ -127,9 +138,11 @@ jobs:
127138
- name: Install node modules
128139
run: pnpm install --frozen-lockfile
129140
- name: Setup Bazel
130-
uses: angular/dev-infra/github-actions/bazel/setup@0ad6a370f70638e785d6ef1f90dc6ede34684a47
141+
uses: angular/dev-infra/github-actions/bazel/setup@e3c0efecadda0e0fbb616abcdf447c788959ca64
131142
- name: Setup Bazel RBE
132-
uses: angular/dev-infra/github-actions/bazel/configure-remote@0ad6a370f70638e785d6ef1f90dc6ede34684a47
143+
uses: angular/dev-infra/github-actions/bazel/configure-remote@e3c0efecadda0e0fbb616abcdf447c788959ca64
144+
with:
145+
google_credential: ${{ secrets.RBE_TRUSTED_BUILDS_USER }}
133146
- name: Run CLI E2E tests
134147
run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=3 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
135148

@@ -149,9 +162,11 @@ jobs:
149162
- name: Install node modules
150163
run: pnpm install --frozen-lockfile
151164
- name: Setup Bazel
152-
uses: angular/dev-infra/github-actions/bazel/setup@0ad6a370f70638e785d6ef1f90dc6ede34684a47
165+
uses: angular/dev-infra/github-actions/bazel/setup@e3c0efecadda0e0fbb616abcdf447c788959ca64
153166
- name: Setup Bazel RBE
154-
uses: angular/dev-infra/github-actions/bazel/configure-remote@0ad6a370f70638e785d6ef1f90dc6ede34684a47
167+
uses: angular/dev-infra/github-actions/bazel/configure-remote@e3c0efecadda0e0fbb616abcdf447c788959ca64
168+
with:
169+
google_credential: ${{ secrets.RBE_TRUSTED_BUILDS_USER }}
155170
- name: Run CLI E2E tests
156171
run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }}
157172

@@ -167,9 +182,11 @@ jobs:
167182
- name: Install node modules
168183
run: pnpm install --frozen-lockfile
169184
- name: Setup Bazel
170-
uses: angular/dev-infra/github-actions/bazel/setup@0ad6a370f70638e785d6ef1f90dc6ede34684a47
185+
uses: angular/dev-infra/github-actions/bazel/setup@e3c0efecadda0e0fbb616abcdf447c788959ca64
171186
- name: Setup Bazel RBE
172-
uses: angular/dev-infra/github-actions/bazel/configure-remote@0ad6a370f70638e785d6ef1f90dc6ede34684a47
187+
uses: angular/dev-infra/github-actions/bazel/configure-remote@e3c0efecadda0e0fbb616abcdf447c788959ca64
188+
with:
189+
google_credential: ${{ secrets.RBE_TRUSTED_BUILDS_USER }}
173190
- name: Run E2E Browser tests
174191
env:
175192
SAUCE_USERNAME: ${{ vars.SAUCE_USERNAME }}

‎.github/workflows/dev-infra.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
16-
- uses: angular/dev-infra/github-actions/commit-message-based-labels@0ad6a370f70638e785d6ef1f90dc6ede34684a47
16+
- uses: angular/dev-infra/github-actions/commit-message-based-labels@e3c0efecadda0e0fbb616abcdf447c788959ca64
1717
with:
1818
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
1919
post_approval_changes:
2020
runs-on: ubuntu-latest
2121
steps:
2222
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
23-
- uses: angular/dev-infra/github-actions/post-approval-changes@0ad6a370f70638e785d6ef1f90dc6ede34684a47
23+
- uses: angular/dev-infra/github-actions/post-approval-changes@e3c0efecadda0e0fbb616abcdf447c788959ca64
2424
with:
2525
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}

‎.github/workflows/feature-requests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ jobs:
1616
if: github.repository == 'angular/angular-cli'
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: angular/dev-infra/github-actions/feature-request@0ad6a370f70638e785d6ef1f90dc6ede34684a47
19+
- uses: angular/dev-infra/github-actions/feature-request@e3c0efecadda0e0fbb616abcdf447c788959ca64
2020
with:
2121
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}

‎.github/workflows/perf.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- name: Initialize environment
4141
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b79ac7f5d6689becb7f2d559affbab5afb361389
4242
- name: Setup Bazel
43-
uses: angular/dev-infra/github-actions/bazel/setup@0ad6a370f70638e785d6ef1f90dc6ede34684a47
43+
uses: angular/dev-infra/github-actions/bazel/setup@e3c0efecadda0e0fbb616abcdf447c788959ca64
4444
- name: Install node modules
4545
run: pnpm install --frozen-lockfile
4646
# We utilize the google-github-actions/auth action to allow us to get an active credential using workflow

‎.github/workflows/pr.yml‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
- name: Run Validation
5555
run: pnpm admin validate
5656
- name: Check Package Licenses
57-
uses: angular/dev-infra/github-actions/linting/licenses@0ad6a370f70638e785d6ef1f90dc6ede34684a47
57+
uses: angular/dev-infra/github-actions/linting/licenses@e3c0efecadda0e0fbb616abcdf447c788959ca64
5858
- name: Check tooling setup
5959
run: pnpm check-tooling-setup
6060
- name: Check commit message
@@ -72,9 +72,9 @@ jobs:
7272
- name: Initialize environment
7373
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b79ac7f5d6689becb7f2d559affbab5afb361389
7474
- name: Setup Bazel
75-
uses: angular/dev-infra/github-actions/bazel/setup@0ad6a370f70638e785d6ef1f90dc6ede34684a47
75+
uses: angular/dev-infra/github-actions/bazel/setup@e3c0efecadda0e0fbb616abcdf447c788959ca64
7676
- name: Setup Bazel RBE
77-
uses: angular/dev-infra/github-actions/bazel/configure-remote@0ad6a370f70638e785d6ef1f90dc6ede34684a47
77+
uses: angular/dev-infra/github-actions/bazel/configure-remote@e3c0efecadda0e0fbb616abcdf447c788959ca64
7878
- name: Install node modules
7979
run: pnpm install --frozen-lockfile
8080
- name: Build release targets
@@ -93,9 +93,9 @@ jobs:
9393
- name: Initialize environment
9494
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b79ac7f5d6689becb7f2d559affbab5afb361389
9595
- name: Setup Bazel
96-
uses: angular/dev-infra/github-actions/bazel/setup@0ad6a370f70638e785d6ef1f90dc6ede34684a47
96+
uses: angular/dev-infra/github-actions/bazel/setup@e3c0efecadda0e0fbb616abcdf447c788959ca64
9797
- name: Setup Bazel RBE
98-
uses: angular/dev-infra/github-actions/bazel/configure-remote@0ad6a370f70638e785d6ef1f90dc6ede34684a47
98+
uses: angular/dev-infra/github-actions/bazel/configure-remote@e3c0efecadda0e0fbb616abcdf447c788959ca64
9999
- name: Install node modules
100100
run: pnpm install --frozen-lockfile
101101
- name: Run module and package tests
@@ -119,9 +119,9 @@ jobs:
119119
- name: Install node modules
120120
run: pnpm install --frozen-lockfile
121121
- name: Setup Bazel
122-
uses: angular/dev-infra/github-actions/bazel/setup@0ad6a370f70638e785d6ef1f90dc6ede34684a47
122+
uses: angular/dev-infra/github-actions/bazel/setup@e3c0efecadda0e0fbb616abcdf447c788959ca64
123123
- name: Setup Bazel RBE
124-
uses: angular/dev-infra/github-actions/bazel/configure-remote@0ad6a370f70638e785d6ef1f90dc6ede34684a47
124+
uses: angular/dev-infra/github-actions/bazel/configure-remote@e3c0efecadda0e0fbb616abcdf447c788959ca64
125125
- name: Run CLI E2E tests
126126
run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
127127

@@ -131,6 +131,10 @@ jobs:
131131
steps:
132132
- name: Initialize environment
133133
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b79ac7f5d6689becb7f2d559affbab5afb361389
134+
- name: Setup Bazel RBE
135+
uses: angular/dev-infra/github-actions/bazel/configure-remote@e3c0efecadda0e0fbb616abcdf447c788959ca64
136+
with:
137+
allow_windows_rbe: true
134138
- name: Run CLI E2E tests
135139
uses: ./.github/shared-actions/windows-bazel-test
136140
with:
@@ -153,9 +157,9 @@ jobs:
153157
- name: Install node modules
154158
run: pnpm install --frozen-lockfile
155159
- name: Setup Bazel
156-
uses: angular/dev-infra/github-actions/bazel/setup@0ad6a370f70638e785d6ef1f90dc6ede34684a47
160+
uses: angular/dev-infra/github-actions/bazel/setup@e3c0efecadda0e0fbb616abcdf447c788959ca64
157161
- name: Setup Bazel RBE
158-
uses: angular/dev-infra/github-actions/bazel/configure-remote@0ad6a370f70638e785d6ef1f90dc6ede34684a47
162+
uses: angular/dev-infra/github-actions/bazel/configure-remote@e3c0efecadda0e0fbb616abcdf447c788959ca64
159163
- name: Run CLI E2E tests
160164
run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=3 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
161165

@@ -176,8 +180,8 @@ jobs:
176180
- name: Install node modules
177181
run: pnpm install --frozen-lockfile
178182
- name: Setup Bazel
179-
uses: angular/dev-infra/github-actions/bazel/setup@0ad6a370f70638e785d6ef1f90dc6ede34684a47
183+
uses: angular/dev-infra/github-actions/bazel/setup@e3c0efecadda0e0fbb616abcdf447c788959ca64
180184
- name: Setup Bazel RBE
181-
uses: angular/dev-infra/github-actions/bazel/configure-remote@0ad6a370f70638e785d6ef1f90dc6ede34684a47
185+
uses: angular/dev-infra/github-actions/bazel/configure-remote@e3c0efecadda0e0fbb616abcdf447c788959ca64
182186
- name: Run CLI E2E tests
183187
run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }}

0 commit comments

Comments
 (0)