Skip to content

Commit 3784aff

Browse files
authored
Merge branch 'angular:main' into slide-toggle
2 parents 606e507 + ed7e1da commit 3784aff

File tree

36 files changed

+967
-1153
lines changed

36 files changed

+967
-1153
lines changed

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.7.1
1+
8.4.2

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
assistant_to_the_branch_manager:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
16+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
1717
with:
1818
persist-credentials: false
1919
- uses: angular/dev-infra/github-actions/branch-manager@95e3a0ede6dfa1aedd34b03918ad72b18f87e5ae

.github/workflows/ci.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,16 @@ jobs:
2424
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@95e3a0ede6dfa1aedd34b03918ad72b18f87e5ae
2525
- name: Install node modules
2626
run: pnpm install --frozen-lockfile
27+
# TODO: Remove --ignore_all_rc_files flag once a repository can be loaded in bazelrc during info
28+
# commands again. See https://github.com/bazelbuild/bazel/issues/25145 for more context.
2729
- name: Checking package externals
2830
run: |
2931
bazel build //:package_externals
30-
pnpm check-package-externals $(bazel info bazel-bin)/package_externals.json
32+
pnpm check-package-externals $(bazel --ignore_all_rc_files info bazel-bin)/package_externals.json
3133
- name: Checking entry-points configuration
3234
run: |
3335
bazel build //:entry_points_manifest
34-
pnpm check-entry-point-setup $(bazel info bazel-bin)/entry_points_manifest.json
36+
pnpm check-entry-point-setup $(bazel --ignore_all_rc_files info bazel-bin)/entry_points_manifest.json
3537
- name: Validate pull approve configuration
3638
run: pnpm ng-dev pullapprove verify
3739
- name: Check for component id collisions

.github/workflows/dev-infra.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ jobs:
1111
labels:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
14+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
1515
- uses: angular/dev-infra/github-actions/pull-request-labeling@95e3a0ede6dfa1aedd34b03918ad72b18f87e5ae
1616
with:
1717
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
1818
post_approval_changes:
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
21+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2222
- uses: angular/dev-infra/github-actions/post-approval-changes@95e3a0ede6dfa1aedd34b03918ad72b18f87e5ae
2323
with:
2424
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}

.github/workflows/docs-preview-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
runs-on: ubuntu-latest
3030
if: ${{ github.event.workflow_run.conclusion == 'success' }}
3131
steps:
32-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
32+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
3333
with:
3434
token: '${{secrets.GITHUB_TOKEN}}'
3535

.github/workflows/google-internal-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
trigger:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
15+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
1616
- uses: angular/dev-infra/github-actions/google-internal-tests@95e3a0ede6dfa1aedd34b03918ad72b18f87e5ae
1717
with:
1818
run-tests-guide-url: http://go/angular-material-presubmit

.github/workflows/pr.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,16 @@ jobs:
2222
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@95e3a0ede6dfa1aedd34b03918ad72b18f87e5ae
2323
- name: Install node modules
2424
run: pnpm install --frozen-lockfile
25+
# TODO: Remove --ignore_all_rc_files flag once a repository can be loaded in bazelrc during info
26+
# commands again. See https://github.com/bazelbuild/bazel/issues/25145 for more context.
2527
- name: Checking package externals
2628
run: |
2729
bazel build //:package_externals
28-
pnpm check-package-externals $(bazel info bazel-bin)/package_externals.json
30+
pnpm check-package-externals $(bazel --ignore_all_rc_files info bazel-bin)/package_externals.json
2931
- name: Checking entry-points configuration
3032
run: |
3133
bazel build //:entry_points_manifest
32-
pnpm check-entry-point-setup $(bazel info bazel-bin)/entry_points_manifest.json
34+
pnpm check-entry-point-setup $(bazel --ignore_all_rc_files info bazel-bin)/entry_points_manifest.json
3335
- name: Validate pull approve configuration
3436
run: pnpm ng-dev pullapprove verify
3537
- name: Check for component id collisions

.github/workflows/preview-deploy-dev-app.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-latest
2626
if: ${{ github.event.workflow_run.conclusion == 'success' }}
2727
steps:
28-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
28+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2929

3030
- name: Configure Firebase deploy target
3131
run: |

.github/workflows/scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
steps:
2727
- name: 'Checkout code'
28-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
28+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2929
with:
3030
persist-credentials: false
3131

@@ -47,6 +47,6 @@ jobs:
4747

4848
# Upload the results to GitHub's code scanning dashboard.
4949
- name: 'Upload to code-scanning'
50-
uses: github/codeql-action/upload-sarif@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
50+
uses: github/codeql-action/upload-sarif@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
5151
with:
5252
sarif_file: results.sarif

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ git_override(
3939
bazel_dep(name = "devinfra")
4040
git_override(
4141
module_name = "devinfra",
42-
commit = "95e3a0ede6dfa1aedd34b03918ad72b18f87e5ae",
42+
commit = "e53a3b15d4c80d8a6030992399e753878e21d57a",
4343
remote = "https://github.com/angular/dev-infra.git",
4444
)
4545

0 commit comments

Comments
 (0)