Skip to content

Commit d9879b5

Browse files
committed
Merge branch 'main' into dev
2 parents bec9552 + aa7d9fc commit d9879b5

477 files changed

Lines changed: 80750 additions & 49307 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.angular-github/actions/deploy-docs-site/main.js

Lines changed: 21970 additions & 9645 deletions
Large diffs are not rendered by default.

.angular-github/workflows/adev-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@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
32+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
3333
with:
3434
token: '${{secrets.GITHUB_TOKEN}}'
3535
persist-credentials: false

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
if: github.event.repository.fork == false
1616
steps:
17-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
17+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
1818
with:
1919
persist-credentials: false
2020
- uses: angular/dev-infra/github-actions/branch-manager@442c2fcbf06a321b5196b4c5fc70e78a49242958

.angular-github/workflows/benchmark-compare.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- uses: alessbell/pull-request-comment-branch@ef3408c9757d05f89cb525036383033a313758a0 # v2.1.0
2929
id: comment-branch
3030

31-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
31+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
3232
with:
3333
# Specify repository as the PR branch might be from a fork.
3434
repository: ${{steps.comment-branch.outputs.head_owner}}/${{steps.comment-branch.outputs.head_repo}}
@@ -39,17 +39,19 @@ jobs:
3939
# We cannot use `angular/dev-infra/github-actions/npm/checkout-and-setup-node` here
4040
# because it does not support checking out from a fork (as it lacks a `repository` input).
4141
# Thus, we checkout and setup Node/pnpm manually.
42-
- name: Install pnpm
43-
uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
44-
4542
- name: Setup Node.js
4643
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
4744
with:
4845
node-version-file: '.nvmrc'
49-
cache: 'pnpm'
46+
47+
- name: Install pnpm
48+
uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
5049

5150
- run: pnpm install --frozen-lockfile
5251

52+
- name: Setup Bazel
53+
uses: angular/dev-infra/github-actions/bazel/setup@442c2fcbf06a321b5196b4c5fc70e78a49242958
54+
5355
- uses: angular/dev-infra/github-actions/bazel/configure-remote@442c2fcbf06a321b5196b4c5fc70e78a49242958
5456
with:
5557
bazelrc: ./.bazelrc.user
@@ -61,10 +63,12 @@ jobs:
6163
COMMENT_BODY: ${{ github.event.comment.body }}
6264
run: pnpm benchmarks prepare-for-github-action "$COMMENT_BODY"
6365

64-
- run: pnpm benchmarks run-compare ${{steps.info.outputs.compareSha}} "${{steps.info.outputs.benchmarkTarget}}"
65-
66+
- run: pnpm benchmarks run-compare "$COMPARE_SHA" "$BENCHMARK_TARGET"
6667
id: benchmark
6768
name: Running benchmark
69+
env:
70+
BENCHMARK_TARGET: ${{steps.info.outputs.benchmarkTarget}}
71+
COMPARE_SHA: ${{steps.info.outputs.compareSha}}
6872

6973
- uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5
7074
with:

.angular-github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
- name: Test build
5858
run: pnpm devtools:build:chrome
5959
- name: Cypress run
60-
uses: cypress-io/github-action@dace029018fcdf86e0df89a31bc3cfa5b32570d8 # v7.3.0
60+
uses: cypress-io/github-action@948d67d3074f1bbb6379c8bdbb04e95d2f8e593f # v7.4.0
6161
with:
6262
command: pnpm devtools:test:e2e
6363
start: pnpm bazel run //devtools/src:devserver

.angular-github/workflows/cross-repo-adev-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
steps:
2626
- name: Checkout the repository
27-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
27+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2828
with:
2929
# Setting `persist-credentials: false` prevents the github-action account from being the
3030
# account that is attempted to be used for authentication, instead the remote is set to

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
statuses: write
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
16+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
1717
- uses: angular/dev-infra/github-actions/google-internal-tests@442c2fcbf06a321b5196b4c5fc70e78a49242958
1818
with:
1919
run-tests-guide-url: http://go/angular-g3sync-start

.angular-github/workflows/pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
- name: Test build
6262
run: pnpm devtools:build:chrome
6363
- name: Cypress run
64-
uses: cypress-io/github-action@dace029018fcdf86e0df89a31bc3cfa5b32570d8 # v7.3.0
64+
uses: cypress-io/github-action@948d67d3074f1bbb6379c8bdbb04e95d2f8e593f # v7.4.0
6565
with:
6666
command: pnpm devtools:test:e2e
6767
start: pnpm bazel run //devtools/src:devserver

.angular-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@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
28+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
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@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
50+
uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
5151
with:
5252
sarif_file: results.sarif

.github/workflows/release.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Publish Release
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- '[0-9]+.[0-9]+.x'
8+
workflow_dispatch: # Allow manual trigger for verification
9+
10+
# Ensure only one release runs at a time PER BRANCH to avoid race conditions.
11+
concurrency:
12+
group: release-${{ github.ref }}
13+
cancel-in-progress: false
14+
15+
permissions:
16+
contents: read # Required to checkout the repository
17+
id-token: write # Required for NPM provenance in reusable workflow
18+
19+
jobs:
20+
release:
21+
uses: angular/dev-infra/.github/workflows/reusable-release.yml@a8a341bd2b49b931c92408d497588b6acd012eeb
22+
secrets:
23+
wombot-token: ${{ secrets.WOMBOT_TOKEN }}
24+
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}

0 commit comments

Comments
 (0)