Skip to content

Commit

Permalink
Merge branch 'main' into rfc-prebuilt-rules-customization
Browse files Browse the repository at this point in the history
  • Loading branch information
jpdjere authored Apr 3, 2024
2 parents 924e393 + 0a3a8bb commit dadbd7d
Show file tree
Hide file tree
Showing 18,741 changed files with 537,935 additions and 735,798 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 2 additions & 1 deletion .backportrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"repoName": "kibana",
"targetBranchChoices": [
"main",
"8.13",
"8.12",
"8.11",
"8.10",
Expand Down Expand Up @@ -49,7 +50,7 @@
"backport"
],
"branchLabelMapping": {
"^v8.13.0$": "main",
"^v8.14.0$": "main",
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
},
"autoMerge": true,
Expand Down
1 change: 0 additions & 1 deletion .bazelignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# https:/bazelbuild/bazel/issues/7093
# https:/bazelbuild/bazel/issues/8106
.buildkite
.ci
.chromium
.git
.github
Expand Down
110 changes: 62 additions & 48 deletions .buildkite/ftr_configs.yml

Large diffs are not rendered by default.

6 changes: 1 addition & 5 deletions .buildkite/hooks/post-command
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
#!/usr/bin/env bash

if [[ "$BUILDKITE_AGENT_NAME" =~ ^bk-agent ]]; then
echo "Pipeline file triggered from outside the kibana executors, skipping post_command"
else
.buildkite/scripts/lifecycle/post_command.sh
fi
source .buildkite/scripts/lifecycle/post_command.sh
7 changes: 1 addition & 6 deletions .buildkite/hooks/pre-command
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
#!/usr/bin/env bash

if [[ "$BUILDKITE_AGENT_NAME" =~ ^bk-agent ]]; then
echo "Pipeline file triggered from outside the kibana executors, skipping .buildkite/scripts/lifecycle/pre_command.sh"
export SONAR_LOGIN=$(vault read -field=token secret/ci/elastic-kibana/sonarqube)
else
source .buildkite/scripts/lifecycle/pre_command.sh
fi
source .buildkite/scripts/lifecycle/pre_command.sh
166 changes: 35 additions & 131 deletions .buildkite/package-lock.json

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

5 changes: 4 additions & 1 deletion .buildkite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
"test": "mocha",
"test:watch": "mocha --watch"
},
"overrides": {
"serialize-javascript": "^6.0.2"
},
"dependencies": {
"@octokit/rest": "^18.10.0",
"axios": "^1.6.3",
Expand All @@ -21,7 +24,7 @@
"@types/mocha": "^10.0.1",
"@types/node": "^15.12.2",
"chai": "^4.3.10",
"mocha": "^10.2.0",
"mocha": "^10.3.0",
"nock": "^12.0.2",
"ts-node": "^10.7.0",
"typescript": "^4.6.4"
Expand Down
Loading

0 comments on commit dadbd7d

Please sign in to comment.