mirror of
https://github.com/angular/angular.git
synced 2026-09-14 13:54:52 +08:00
build(devtools): disable the "Rebase PR on target branch" circleci job so that the PR that merges the unrelated history of rangle/angular-devtools can be successfully merged into angular/angular
Usually this job would ensure that all PRs in angular/angular are running against the latest changes to angular/angular. In order to merge the unrelated history of the commits in the rangle/angular-devtools repo into angular/angular, we must temporarily disable this job.
This commit is contained in:
+15
-13
@@ -237,19 +237,21 @@ jobs:
|
||||
- checkout
|
||||
- save_month_to_file
|
||||
- init_environment
|
||||
- run:
|
||||
name: Rebase PR on target branch
|
||||
# After checkout, rebase on top of target branch.
|
||||
command: >
|
||||
if [[ -n "${CIRCLE_PR_NUMBER}" ]]; then
|
||||
# User is required for rebase.
|
||||
git config user.name "angular-ci"
|
||||
git config user.email "angular-ci"
|
||||
# Rebase PR on top of target branch.
|
||||
node .circleci/rebase-pr.js
|
||||
else
|
||||
echo "This build is not over a PR, nothing to do."
|
||||
fi
|
||||
|
||||
# TODO(aleksanderbodurri): renable this as soon as angular-devtools is tranfered into angular/angular
|
||||
# - run:
|
||||
# name: Rebase PR on target branch
|
||||
# # After checkout, rebase on top of target branch.
|
||||
# command: >
|
||||
# if [[ -n "${CIRCLE_PR_NUMBER}" ]]; then
|
||||
# # User is required for rebase.
|
||||
# git config user.name "angular-ci"
|
||||
# git config user.email "angular-ci"
|
||||
# # Rebase PR on top of target branch.
|
||||
# node .circleci/rebase-pr.js
|
||||
# else
|
||||
# echo "This build is not over a PR, nothing to do."
|
||||
# fi
|
||||
# This cache is saved in the build-npm-packages so that Bazel cache is also included.
|
||||
- restore_cache:
|
||||
keys:
|
||||
|
||||
@@ -12,6 +12,7 @@ export const format: FormatConfig = {
|
||||
'clang-format': {
|
||||
'matchers': [
|
||||
'**/*.{js,ts}',
|
||||
'!devtools/**',
|
||||
// TODO: burn down format failures and remove aio and integration exceptions.
|
||||
'!aio/**',
|
||||
'!integration/**',
|
||||
|
||||
@@ -14,7 +14,6 @@
|
||||
"directive-class-suffix": true,
|
||||
"directive-selector": [true, "attribute", ["ng", "app"], "camelCase"],
|
||||
"component-selector": [true, "element", ["ng", "app"], "kebab-case"],
|
||||
"import-blacklist": [true, "rxjs/Rx"],
|
||||
"interface-name": false,
|
||||
"max-classes-per-file": false,
|
||||
"max-line-length": [true, 140],
|
||||
|
||||
Reference in New Issue
Block a user