Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create a new pull request by comparing changes across two branches #1109

Merged
merged 4 commits into from
Aug 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/assistant-to-the-branch-manager.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ jobs:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
persist-credentials: false
- uses: angular/dev-infra/github-actions/branch-manager@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
- uses: angular/dev-infra/github-actions/branch-manager@56966c765e97f463c4795fac85d46543d1e6b342
with:
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
42 changes: 21 additions & 21 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@56966c765e97f463c4795fac85d46543d1e6b342
- name: Install node modules
run: yarn install --immutable
- name: Generate JSON schema types
Expand All @@ -42,11 +42,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@56966c765e97f463c4795fac85d46543d1e6b342
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/bazel/setup@56966c765e97f463c4795fac85d46543d1e6b342
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/bazel/configure-remote@56966c765e97f463c4795fac85d46543d1e6b342
- name: Install node modules
run: yarn install --immutable
- name: Build release targets
Expand All @@ -56,11 +56,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@56966c765e97f463c4795fac85d46543d1e6b342
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/bazel/setup@56966c765e97f463c4795fac85d46543d1e6b342
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/bazel/configure-remote@56966c765e97f463c4795fac85d46543d1e6b342
- name: Install node modules
run: yarn install --immutable
- name: Run module tests
Expand Down Expand Up @@ -92,13 +92,13 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@56966c765e97f463c4795fac85d46543d1e6b342
- name: Install node modules
run: yarn install --immutable
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/bazel/setup@56966c765e97f463c4795fac85d46543d1e6b342
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/bazel/configure-remote@56966c765e97f463c4795fac85d46543d1e6b342
- name: Run CLI E2E tests
run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}

Expand All @@ -113,13 +113,13 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@56966c765e97f463c4795fac85d46543d1e6b342
- name: Install node modules
run: yarn install --immutable
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/bazel/setup@56966c765e97f463c4795fac85d46543d1e6b342
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/bazel/configure-remote@56966c765e97f463c4795fac85d46543d1e6b342
- name: Run CLI E2E tests
run: yarn bazel test --define=E2E_SHARD_TOTAL=3 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}

Expand All @@ -134,13 +134,13 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@56966c765e97f463c4795fac85d46543d1e6b342
- name: Install node modules
run: yarn install --immutable
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/bazel/setup@56966c765e97f463c4795fac85d46543d1e6b342
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/bazel/configure-remote@56966c765e97f463c4795fac85d46543d1e6b342
- name: Run CLI E2E tests
run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }}

Expand All @@ -151,13 +151,13 @@ jobs:
SAUCE_TUNNEL_IDENTIFIER: angular-cli-${{ github.workflow }}-${{ github.run_number }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@56966c765e97f463c4795fac85d46543d1e6b342
- name: Install node modules
run: yarn install --immutable
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/bazel/setup@56966c765e97f463c4795fac85d46543d1e6b342
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/bazel/configure-remote@56966c765e97f463c4795fac85d46543d1e6b342
- name: Run E2E Browser tests
env:
SAUCE_USERNAME: ${{ vars.SAUCE_USERNAME }}
Expand All @@ -184,11 +184,11 @@ jobs:
CIRCLE_BRANCH: ${{ github.ref_name }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@56966c765e97f463c4795fac85d46543d1e6b342
- name: Install node modules
run: yarn install --immutable
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/bazel/setup@56966c765e97f463c4795fac85d46543d1e6b342
- run: yarn admin snapshots --verbose
env:
SNAPSHOT_BUILDS_GITHUB_TOKEN: ${{ secrets.SNAPSHOT_BUILDS_GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions .github/workflows/dev-infra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: angular/dev-infra/github-actions/commit-message-based-labels@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
- uses: angular/dev-infra/github-actions/commit-message-based-labels@56966c765e97f463c4795fac85d46543d1e6b342
with:
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
post_approval_changes:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: angular/dev-infra/github-actions/post-approval-changes@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
- uses: angular/dev-infra/github-actions/post-approval-changes@56966c765e97f463c4795fac85d46543d1e6b342
with:
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
2 changes: 1 addition & 1 deletion .github/workflows/feature-requests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ jobs:
if: github.repository == 'angular/angular-cli'
runs-on: ubuntu-latest
steps:
- uses: angular/dev-infra/github-actions/feature-request@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
- uses: angular/dev-infra/github-actions/feature-request@56966c765e97f463c4795fac85d46543d1e6b342
with:
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
34 changes: 17 additions & 17 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@56966c765e97f463c4795fac85d46543d1e6b342
- name: Setup ESLint Caching
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
with:
Expand All @@ -54,7 +54,7 @@ jobs:
- name: Run Validation
run: yarn admin validate
- name: Check Package Licenses
uses: angular/dev-infra/github-actions/linting/licenses@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/linting/licenses@56966c765e97f463c4795fac85d46543d1e6b342
- name: Check tooling setup
run: yarn check-tooling-setup
- name: Check commit message
Expand All @@ -70,11 +70,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@56966c765e97f463c4795fac85d46543d1e6b342
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/bazel/setup@56966c765e97f463c4795fac85d46543d1e6b342
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/bazel/configure-remote@56966c765e97f463c4795fac85d46543d1e6b342
- name: Install node modules
run: yarn install --immutable
- name: Build release targets
Expand All @@ -90,11 +90,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@56966c765e97f463c4795fac85d46543d1e6b342
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/bazel/setup@56966c765e97f463c4795fac85d46543d1e6b342
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/bazel/configure-remote@56966c765e97f463c4795fac85d46543d1e6b342
- name: Install node modules
run: yarn install --immutable
- name: Run module tests
Expand All @@ -113,13 +113,13 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@56966c765e97f463c4795fac85d46543d1e6b342
- name: Install node modules
run: yarn install --immutable
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/bazel/setup@56966c765e97f463c4795fac85d46543d1e6b342
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/bazel/configure-remote@56966c765e97f463c4795fac85d46543d1e6b342
- name: Run CLI E2E tests
run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}

Expand All @@ -134,13 +134,13 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@56966c765e97f463c4795fac85d46543d1e6b342
- name: Install node modules
run: yarn install --immutable
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/bazel/setup@56966c765e97f463c4795fac85d46543d1e6b342
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/bazel/configure-remote@56966c765e97f463c4795fac85d46543d1e6b342
- name: Run CLI E2E tests
run: yarn bazel test --define=E2E_SHARD_TOTAL=3 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}

Expand All @@ -157,12 +157,12 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@56966c765e97f463c4795fac85d46543d1e6b342
- name: Install node modules
run: yarn install --immutable
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/bazel/setup@56966c765e97f463c4795fac85d46543d1e6b342
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@c41cfb4902c0ca0c72bde19650eb8186a6a7ba7e
uses: angular/dev-infra/github-actions/bazel/configure-remote@56966c765e97f463c4795fac85d46543d1e6b342
- name: Run CLI E2E tests
run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }}
28 changes: 28 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,31 @@
<a name="18.2.0-next.3"></a>

# 18.2.0-next.3 (2024-07-31)

### @angular/build

| Commit | Type | Description |
| --------------------------------------------------------------------------------------------------- | ---- | ----------------------------------------------------------------------------- |
| [636cb6932](https://github.com/angular/angular-cli/commit/636cb6932425b838ccd14ae6ce8b51663e6ded47) | fix | add CSP `nonce` attribute to script tags when inline critical CSS is disabled |
| [7d52941a2](https://github.com/angular/angular-cli/commit/7d52941a2e36b1e08001d7042c9d3e258d8e8b34) | fix | prevent build failures with remote CSS imports when Tailwind is configured |
| [0466fb74a](https://github.com/angular/angular-cli/commit/0466fb74a2559e2b3cbcf0828de5b5e10b729ddb) | fix | resolve error with `extract-i18n` builder for libraries |

<!-- CHANGELOG SPLIT MARKER -->

<a name="18.1.3"></a>

# 18.1.3 (2024-07-31)

### @angular/build

| Commit | Type | Description |
| --------------------------------------------------------------------------------------------------- | ---- | ----------------------------------------------------------------------------- |
| [a28615d7d](https://github.com/angular/angular-cli/commit/a28615d7dd3f6503f257756058fe182ce6f6b052) | fix | add CSP `nonce` attribute to script tags when inline critical CSS is disabled |
| [747a1447c](https://github.com/angular/angular-cli/commit/747a1447c1855a1bb918e5f55e4ba4182235f88a) | fix | prevent build failures with remote CSS imports when Tailwind is configured |
| [c0933f2c0](https://github.com/angular/angular-cli/commit/c0933f2c0354a13ba3f752f29b24054177697faa) | fix | resolve error with `extract-i18n` builder for libraries |

<!-- CHANGELOG SPLIT MARKER -->

<a name="18.2.0-next.2"></a>

# 18.2.0-next.2 (2024-07-24)
Expand Down
Loading
Loading