Skip to content

Commit

Permalink
Merge branch 'main' into feature-fix-data-streams-serverless
Browse files Browse the repository at this point in the history
  • Loading branch information
elasticmachine authored Nov 17, 2024
2 parents fc3f72e + 0ed8230 commit 6e46134
Show file tree
Hide file tree
Showing 1,216 changed files with 33,031 additions and 17,702 deletions.
12 changes: 6 additions & 6 deletions .buildkite/package-lock.json

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

15 changes: 15 additions & 0 deletions .buildkite/pipelines/on_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,21 @@ steps:
- exit_status: '-1'
limit: 3

- command: .buildkite/scripts/steps/openapi_publishing/publish_oas_docs.sh
label: 'Publish OAS docs to bump.sh'
agents:
image: family/kibana-ubuntu-2004
imageProject: elastic-images-prod
provider: gcp
machineType: n2-standard-2
preemptible: true
timeout_in_minutes: 60
soft_fail: true
retry:
automatic:
- exit_status: '-1'
limit: 3

- command: .buildkite/scripts/steps/bazel_cache/bootstrap_linux.sh
label: 'Populate local dev bazel cache (Linux)'
agents:
Expand Down
10 changes: 9 additions & 1 deletion .buildkite/scripts/steps/openapi_bundling/final_merge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,16 @@ set -euo pipefail

source .buildkite/scripts/common/util.sh

cur_dir=$(pwd)
cd oas_docs

echo --- Installing NPM modules
npm install

echo --- Merge Kibana OpenAPI specs
make api-docs
# make api-docs-lint <-- Relies on JSONPath version with RCE vulnerabilities based on `npm audit`, https://github.com/advisories/GHSA-pppg-cpfq-h7wr

(cd oas_docs && make api-docs && make api-docs-lint)
cd "$cur_dir"

check_for_changed_files "make api-docs" true
Loading

0 comments on commit 6e46134

Please sign in to comment.