Skip to content

Commit f509e42

Browse files
Merge branch 'master' into chore/jest-circus-oss
2 parents 42a662d + cb704a2 commit f509e42

File tree

4,930 files changed

+232290
-535344
lines changed

Some content is hidden

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

4,930 files changed

+232290
-535344
lines changed

.backportrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"targetBranchChoices": [
44
{ "name": "master", "checked": true },
55
{ "name": "7.x", "checked": true },
6+
"7.11",
67
"7.10",
78
"7.9",
89
"7.8",
@@ -28,7 +29,7 @@
2829
"targetPRLabels": ["backport"],
2930
"branchLabelMapping": {
3031
"^v8.0.0$": "master",
31-
"^v7.11.0$": "7.x",
32+
"^v7.12.0$": "7.x",
3233
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
3334
}
3435
}

.ci/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
22
# If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
33

4-
ARG NODE_VERSION=14.15.1
4+
ARG NODE_VERSION=14.15.3
55

66
FROM node:${NODE_VERSION} AS base
77

.ci/teamcity/bootstrap.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ source "$(dirname "${0}")/util.sh"
77
tc_start_block "Bootstrap"
88

99
tc_start_block "yarn install and kbn bootstrap"
10-
verify_no_git_changes yarn kbn bootstrap --prefer-offline
10+
verify_no_git_changes yarn kbn bootstrap
1111
tc_end_block "yarn install and kbn bootstrap"
1212

1313
tc_start_block "build kbn-pm"

.ci/teamcity/checks/bundle_limits.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ set -euo pipefail
44

55
source "$(dirname "${0}")/../util.sh"
66

7-
node scripts/build_kibana_platform_plugins --validate-limits
7+
checks-reporter-with-killswitch "Check Bundle Limits" \
8+
node scripts/build_kibana_platform_plugins --validate-limits

.ci/teamcity/checks/commit.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/usr/bin/env bash
2+
3+
set -euo pipefail
4+
5+
source "$(dirname "${0}")/../util.sh"
6+
7+
# Runs pre-commit hook script for the files touched in the last commit.
8+
# That way we can ensure a set of quick commit checks earlier as we removed
9+
# the pre-commit hook installation by default.
10+
# If files are more than 200 we will skip it and just use
11+
# the further ci steps that already check linting and file casing for the entire repo.
12+
checks-reporter-with-killswitch "Quick commit checks" \
13+
"$(dirname "${0}")/commit_check_runner.sh"
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/usr/bin/env bash
2+
3+
echo "!!!!!!!! ATTENTION !!!!!!!!
4+
That check is intended to provide earlier CI feedback after we remove the automatic install for the local pre-commit hook.
5+
If you want, you can still manually install the pre-commit hook locally by running 'node scripts/register_git_hook locally'
6+
!!!!!!!!!!!!!!!!!!!!!!!!!!!
7+
"
8+
9+
node scripts/precommit_hook.js --ref HEAD~1..HEAD --max-files 200 --verbose

.ci/teamcity/checks/doc_api_changes.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ set -euo pipefail
44

55
source "$(dirname "${0}")/../util.sh"
66

7-
yarn run grunt run:checkDocApiChanges
7+
checks-reporter-with-killswitch "Check Doc API Changes" \
8+
node scripts/check_published_api_changes

.ci/teamcity/checks/eslint.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/usr/bin/env bash
2+
3+
set -euo pipefail
4+
5+
source "$(dirname "${0}")/../util.sh"
6+
7+
checks-reporter-with-killswitch "Lint: eslint" \
8+
node scripts/eslint --no-cache

.ci/teamcity/checks/file_casing.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ set -euo pipefail
44

55
source "$(dirname "${0}")/../util.sh"
66

7-
yarn run grunt run:checkFileCasing
7+
checks-reporter-with-killswitch "Check File Casing" \
8+
node scripts/check_file_casing --quiet

.ci/teamcity/checks/i18n.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ set -euo pipefail
44

55
source "$(dirname "${0}")/../util.sh"
66

7-
yarn run grunt run:i18nCheck
7+
checks-reporter-with-killswitch "Check i18n" \
8+
node scripts/i18n_check --ignore-missing

0 commit comments

Comments
 (0)