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

Backport #48372 and #47882 #48384

Closed
wants to merge 2 commits into from
Closed
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
4 changes: 2 additions & 2 deletions .github/workflows/aio-preview-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3.1.0
- uses: ./.github/actions/yarn-install

- uses: angular/dev-infra/github-actions/setup-bazel-remote-exec@3bc93449e11b733260d0294305bf57240d7e0a81
- uses: angular/dev-infra/github-actions/setup-bazel-remote-exec@c3339f5751f9a4fbd7d372b77e08fabc02491a80
with:
bazelrc: ./.bazelrc.user

Expand All @@ -34,7 +34,7 @@ jobs:
# the number of concurrent actions is determined based on the host resources.
- run: bazel build //aio:build --jobs=32 --announce_rc --verbose_failures

- uses: angular/dev-infra/github-actions/deploy-previews/pack-and-upload-artifact@3bc93449e11b733260d0294305bf57240d7e0a81
- uses: angular/dev-infra/github-actions/deploy-previews/pack-and-upload-artifact@c3339f5751f9a4fbd7d372b77e08fabc02491a80
with:
workflow-artifact-name: 'aio'
pull-number: '${{github.event.pull_request.number}}'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/aio-preview-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
npx -y firebase-tools@latest target:clear --project ${{env.PREVIEW_PROJECT}} hosting aio
npx -y firebase-tools@latest target:apply --project ${{env.PREVIEW_PROJECT}} hosting aio ${{env.PREVIEW_PROJECT}}
- uses: angular/dev-infra/github-actions/deploy-previews/upload-artifacts-to-firebase@3bc93449e11b733260d0294305bf57240d7e0a81
- uses: angular/dev-infra/github-actions/deploy-previews/upload-artifacts-to-firebase@c3339f5751f9a4fbd7d372b77e08fabc02491a80
with:
github-token: '${{secrets.GITHUB_TOKEN}}'
workflow-artifact-name: 'aio'
Expand Down
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@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3.1.0
- uses: angular/dev-infra/github-actions/commit-message-based-labels@d87b1b56a970132f90301624cea6b6d70b6d9489
- uses: angular/dev-infra/github-actions/commit-message-based-labels@c3339f5751f9a4fbd7d372b77e08fabc02491a80
with:
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
post_approval_changes:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3.1.0
- uses: angular/dev-infra/github-actions/post-approval-changes@d87b1b56a970132f90301624cea6b6d70b6d9489
- uses: angular/dev-infra/github-actions/post-approval-changes@c3339f5751f9a4fbd7d372b77e08fabc02491a80
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 @@ -14,6 +14,6 @@ jobs:
if: github.repository == 'angular/angular'
runs-on: ubuntu-latest
steps:
- uses: angular/dev-infra/github-actions/feature-request@d87b1b56a970132f90301624cea6b6d70b6d9489
- uses: angular/dev-infra/github-actions/feature-request@c3339f5751f9a4fbd7d372b77e08fabc02491a80
with:
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
2 changes: 1 addition & 1 deletion .github/workflows/google-internal-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3.1.0
- uses: angular/dev-infra/github-actions/google-internal-tests@d87b1b56a970132f90301624cea6b6d70b6d9489
- uses: angular/dev-infra/github-actions/google-internal-tests@c3339f5751f9a4fbd7d372b77e08fabc02491a80
with:
run-tests-guide-url: http://go/angular/g3sync
github-token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lock-closed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ jobs:
if: github.repository == 'angular/angular'
runs-on: ubuntu-latest
steps:
- uses: angular/dev-infra/github-actions/lock-closed@d87b1b56a970132f90301624cea6b6d70b6d9489
- uses: angular/dev-infra/github-actions/lock-closed@c3339f5751f9a4fbd7d372b77e08fabc02491a80
with:
lock-bot-key: ${{ secrets.LOCK_BOT_PRIVATE_KEY }}
2 changes: 1 addition & 1 deletion .github/workflows/update-events.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Generate `events.json`
run: node aio/scripts/generate-events/index.mjs --ignore-invalid-dates
- name: Create a PR (if necessary)
uses: angular/dev-infra/github-actions/create-pr-for-changes@d87b1b56a970132f90301624cea6b6d70b6d9489
uses: angular/dev-infra/github-actions/create-pr-for-changes@c3339f5751f9a4fbd7d372b77e08fabc02491a80
with:
branch-prefix: docs-update-events
pr-title: 'docs: update events'
Expand Down
6 changes: 3 additions & 3 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ http_archive(
# Fetch Aspect lib for utilities like write_source_files
http_archive(
name = "aspect_bazel_lib",
sha256 = "8860aab705fe9f427fbebe388bdfacf8a6b267cb3c0d71ebeaf1dcceedd29193",
strip_prefix = "bazel-lib-1.3.0",
url = "https://github.com/aspect-build/bazel-lib/archive/refs/tags/v1.3.0.tar.gz",
sha256 = "be236556c7b9c7b91cb370e837fdcec62b6e8893408cd4465ae883c9d7c67024",
strip_prefix = "bazel-lib-1.18.0",
url = "https://github.com/aspect-build/bazel-lib/archive/refs/tags/v1.18.0.tar.gz",
)

# Download cli source from angular/cli-builds for doc generation at a specific tag or commit.
Expand Down
98 changes: 28 additions & 70 deletions aio/content/examples/marketing-first-app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions aio/content/examples/marketing-first-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
"version": "0.0.0",
"private": true,
"dependencies": {
"@angular/animations": "15.0.1",
"@angular/common": "15.0.1",
"@angular/compiler": "15.0.1",
"@angular/core": "15.0.1",
"@angular/platform-browser": "15.0.1",
"@angular/platform-browser-dynamic": "15.0.1",
"@angular/animations": "15.1.0-next.1",
"@angular/common": "15.1.0-next.1",
"@angular/compiler": "15.1.0-next.1",
"@angular/core": "15.1.0-next.1",
"@angular/platform-browser": "15.1.0-next.1",
"@angular/platform-browser-dynamic": "15.1.0-next.1",
"rxjs": "^7.5.2",
"tslib": "^2.3.1",
"zone.js": "^0.11.4"
"zone.js": "^0.12.0"
},
"scripts": {
"ng": "ng",
Expand All @@ -32,7 +32,7 @@
"jasmine-spec-reporter": "~7.0.0",
"karma": "~6.4.1",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage": "~2.0.3",
"karma-coverage": "~2.2.0",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "^2.0.0",
"protractor": "~7.0.0",
Expand Down
36 changes: 18 additions & 18 deletions aio/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,33 +62,33 @@
},
"private": true,
"dependencies": {
"@angular/animations": "15.0.1",
"@angular/cdk": "15.0.0",
"@angular/common": "15.0.1",
"@angular/compiler": "15.0.1",
"@angular/core": "15.0.1",
"@angular/elements": "15.0.1",
"@angular/forms": "15.0.1",
"@angular/material": "15.0.0",
"@angular/platform-browser": "15.0.1",
"@angular/platform-browser-dynamic": "15.0.1",
"@angular/router": "15.0.1",
"@angular/service-worker": "15.0.1",
"rxjs": "~7.5.0",
"@angular/animations": "15.1.0-next.1",
"@angular/cdk": "15.1.0-next.0",
"@angular/common": "15.1.0-next.1",
"@angular/compiler": "15.1.0-next.1",
"@angular/core": "15.1.0-next.1",
"@angular/elements": "15.1.0-next.1",
"@angular/forms": "15.1.0-next.1",
"@angular/material": "15.1.0-next.0",
"@angular/platform-browser": "15.1.0-next.1",
"@angular/platform-browser-dynamic": "15.1.0-next.1",
"@angular/router": "15.1.0-next.1",
"@angular/service-worker": "15.1.0-next.1",
"rxjs": "~7.6.0",
"safevalues": "^0.4.2",
"tslib": "^2.3.0",
"zone.js": "~0.11.4"
},
"devDependencies": {
"@angular-devkit/architect-cli": "0.1500.1",
"@angular-devkit/build-angular": "15.0.1",
"@angular-devkit/architect-cli": "0.1501.0-next.1",
"@angular-devkit/build-angular": "15.1.0-next.1",
"@angular-eslint/builder": "^15.0.0",
"@angular-eslint/eslint-plugin": "^15.0.0",
"@angular-eslint/eslint-plugin-template": "^15.0.0",
"@angular-eslint/template-parser": "^15.0.0",
"@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#90004d8813b2da5264a8e9b0e2b3a0d88f44a4ad",
"@angular/cli": "15.0.1",
"@angular/compiler-cli": "15.0.1",
"@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#d94cd02db1a276929ff63739d0b5f80a45a14abf",
"@angular/cli": "15.1.0-next.1",
"@angular/compiler-cli": "15.1.0-next.1",
"@bazel/bazelisk": "^1.7.5",
"@bazel/buildozer": "^5.1.0",
"@bazel/ibazel": "^0.16.2",
Expand Down
2 changes: 1 addition & 1 deletion aio/tools/examples/shared/boilerplate/cli-ajs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"angular": "^1.8.3",
"angular-in-memory-web-api": "~0.14.0",
"angular-route": "1.8.3",
"rxjs": "~7.5.0",
"rxjs": "~7.6.0",
"tslib": "^2.3.0",
"zone.js": "~0.11.4"
},
Expand Down
4 changes: 2 additions & 2 deletions aio/tools/examples/shared/boilerplate/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"@angular/platform-browser": "^15.0.0-rc.1",
"@angular/platform-browser-dynamic": "^15.0.0-rc.1",
"@angular/router": "^15.0.0-rc.1",
"angular-in-memory-web-api": "~0.14.0",
"rxjs": "~7.5.0",
"angular-in-memory-web-api": "~0.15.0",
"rxjs": "~7.6.0",
"tslib": "^2.3.0",
"zone.js": "~0.11.4"
},
Expand Down
4 changes: 2 additions & 2 deletions aio/tools/examples/shared/boilerplate/elements/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
"@angular/platform-browser": "^15.0.0-rc.1",
"@angular/platform-browser-dynamic": "^15.0.0-rc.1",
"@angular/router": "^15.0.0-rc.1",
"angular-in-memory-web-api": "~0.14.0",
"rxjs": "~7.5.0",
"angular-in-memory-web-api": "~0.15.0",
"rxjs": "~7.6.0",
"tslib": "^2.3.0",
"zone.js": "~0.11.4"
},
Expand Down
Loading