Skip to content

Commit 3a49d22

Browse files
authored
Generate elasticsearch-js before Kibana type checks (#3934)
This avoids relying on elasticsearch-js merges, which happens at most once per week.
1 parent bb844d6 commit 3a49d22

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

.buildkite/kibana.sh

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,21 @@ set -euo pipefail
55
# Since we're into the current repo, move to the top-level
66
cd ..
77

8+
echo "--- Install dependencies"
9+
lsb_release -a
10+
apt-get update -y
11+
apt-get install -y unzip
12+
813
echo "--- Clone elasticsearch-js"
914
git clone -v -- git@github.com:elastic/elasticsearch-js.git
10-
pushd elasticsearch-js
11-
git checkout $BUILDKITE_BRANCH
12-
popd
15+
16+
echo "--- Clone elastic-client-generator-js"
17+
git clone -v -- git@github.com:elastic/elastic-client-generator-js.git
18+
mkdir elastic-client-generator-js/output
1319

1420
echo "--- Clone Kibana"
1521
git clone -v --reference /usr/local/git-references/git-github-com-elastic-kibana-git -- git@github.com:elastic/kibana.git
16-
cd kibana
22+
pushd kibana
1723

1824
echo "--- Install Node.js and Yarn"
1925
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash
@@ -25,13 +31,17 @@ set -e
2531
nvm install
2632
nvm use
2733
npm install --global yarn
34+
popd
2835

2936
echo "--- Install elasticsearch-js"
30-
pushd ../elasticsearch-js
37+
pushd elasticsearch-js
3138
npm install
39+
node .buildkite/make.mjs --task codegen main
3240
npm run build
3341
npm pack
3442
popd
43+
44+
pushd kibana
3545
yarn add ../elasticsearch-js/elastic-elasticsearch-*.tgz
3646

3747
echo "--- Bootstrap Kibana"

.buildkite/kibana.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ agents:
33
cpu: "4"
44
ephemeralStorage: 15Gi
55

6-
76
steps:
87
- label: "Run Kibana type checks"
98
command: .buildkite/kibana.sh

0 commit comments

Comments
 (0)