From 98ee97f6216ccf5e65c3b98a43b63fbc775d1321 Mon Sep 17 00:00:00 2001 From: Jamie Tanna Date: Mon, 15 Apr 2024 21:10:46 +0100 Subject: [PATCH] build: remove requirement to clone `open-source` repo (#180715) ## Summary We've decided we'd prefer to vendor the file here, rather than pull the dependency. ### Checklist Delete any items that are not applicable to this PR. - [ ] Any text added follows [EUI's writing guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses sentence case text and includes [i18n support](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md) - [ ] [Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html) was added for features that require explanation or tutorials - [ ] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios - [ ] [Flaky Test Runner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was used on any tests changed - [ ] Any UI touched in this PR is usable by keyboard only (learn more about [keyboard accessibility](https://webaim.org/techniques/keyboard/)) - [ ] Any UI touched in this PR does not create any new axe failures (run axe in browser: [FF](https://addons.mozilla.org/en-US/firefox/addon/axe-devtools/), [Chrome](https://chrome.google.com/webstore/detail/axe-web-accessibility-tes/lhdoppojpmngadmnindnejefpokejbdd?hl=en-US)) - [ ] If a plugin configuration key changed, check if it needs to be allowlisted in the cloud and added to the [docker list](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker) - [ ] This renders correctly on smaller devices using a responsive layout. (You can test this [in your browser](https://www.browserstack.com/guide/responsive-testing-on-local-server)) - [ ] This was checked for [cross-browser compatibility](https://www.elastic.co/support/matrix#matrix_browsers) ### For maintainers - [x] This was checked for breaking API changes and was [labeled appropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process) --- .buildkite/scripts/steps/esql_grammar_sync.sh | 5 +---- licenses/ELASTIC-LICENSE-2.0-HEADER.txt | 6 ++++++ 2 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 licenses/ELASTIC-LICENSE-2.0-HEADER.txt diff --git a/.buildkite/scripts/steps/esql_grammar_sync.sh b/.buildkite/scripts/steps/esql_grammar_sync.sh index 2aa1144dce8c..cd86c27ad324 100755 --- a/.buildkite/scripts/steps/esql_grammar_sync.sh +++ b/.buildkite/scripts/steps/esql_grammar_sync.sh @@ -58,12 +58,9 @@ main () { rm -rf elasticsearch git clone https://github.com/elastic/elasticsearch --depth 1 - rm -rf open-source - git clone https://github.com/elastic/open-source --depth 1 - cd "$KIBANA_DIR" - license_header=$(cat "$PARENT_DIR/open-source/legal/elastic-license-2.0-header.txt") + license_header=$(cat "$KIBANA_DIR/licenses/ELASTIC-LICENSE-2.0-HEADER.txt") report_main_step "Synchronizing lexer grammar..." synchronize_lexer_grammar "$license_header" diff --git a/licenses/ELASTIC-LICENSE-2.0-HEADER.txt b/licenses/ELASTIC-LICENSE-2.0-HEADER.txt new file mode 100644 index 000000000000..1fec1c76430e --- /dev/null +++ b/licenses/ELASTIC-LICENSE-2.0-HEADER.txt @@ -0,0 +1,6 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */