From c1f0b212dfb7872e8f89bc5170279e4734613d73 Mon Sep 17 00:00:00 2001 From: Jonathan Budzenski Date: Mon, 15 Jul 2024 13:35:31 -0500 Subject: [PATCH 1/4] [build] Fix ci:build-all-platforms The upload build artifacts step matches on a glob, which now resolves to two distributions, breaking future commands. This swaps find for the specific distribution. --- .buildkite/scripts/build_kibana.sh | 3 ++- .buildkite/scripts/post_build_kibana.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.buildkite/scripts/build_kibana.sh b/.buildkite/scripts/build_kibana.sh index f586f1cbe3b1e..6971ad1124cf8 100755 --- a/.buildkite/scripts/build_kibana.sh +++ b/.buildkite/scripts/build_kibana.sh @@ -44,7 +44,8 @@ EOF fi echo "--- Archive Kibana Distribution" -linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-*-linux-x86_64.tar.gz')" +version="$(jq -r '.version' package.json)" +linuxBuild="$(find "$KIBANA_DIR/target" -name "kibana-$version-linux-x86_64.tar.gz")" installDir="$KIBANA_DIR/install/kibana" mkdir -p "$installDir" tar -xzf "$linuxBuild" -C "$installDir" --strip=1 diff --git a/.buildkite/scripts/post_build_kibana.sh b/.buildkite/scripts/post_build_kibana.sh index e03c55684bf3d..4ae66b27d2feb 100755 --- a/.buildkite/scripts/post_build_kibana.sh +++ b/.buildkite/scripts/post_build_kibana.sh @@ -20,6 +20,7 @@ fi echo "--- Upload Build Artifacts" # Moving to `target/` first will keep `buildkite-agent` from including directories in the artifact name cd "$KIBANA_DIR/target" -cp kibana-*-linux-x86_64.tar.gz kibana-default.tar.gz +version="$(jq -r '.version' package.json)" +cp "kibana-$version-linux-x86_64.tar.gz" kibana-default.tar.gz buildkite-agent artifact upload "./*.tar.gz;./*.zip;./*.deb;./*.rpm" cd - From 52a7eb1b5d05318dcf9a4dce056b5922776f5205 Mon Sep 17 00:00:00 2001 From: Jonathan Budzenski Date: Mon, 15 Jul 2024 14:16:20 -0500 Subject: [PATCH 2/4] save file --- .buildkite/scripts/build_kibana.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/scripts/build_kibana.sh b/.buildkite/scripts/build_kibana.sh index 6971ad1124cf8..9c5551af29ab7 100755 --- a/.buildkite/scripts/build_kibana.sh +++ b/.buildkite/scripts/build_kibana.sh @@ -45,7 +45,7 @@ fi echo "--- Archive Kibana Distribution" version="$(jq -r '.version' package.json)" -linuxBuild="$(find "$KIBANA_DIR/target" -name "kibana-$version-linux-x86_64.tar.gz")" +linuxBuild="$KIBANA_DIR/target/kibana-$version-linux-x86_64.tar.gz" installDir="$KIBANA_DIR/install/kibana" mkdir -p "$installDir" tar -xzf "$linuxBuild" -C "$installDir" --strip=1 From aab0d50770d5c3d075fdad887bf0b17bd98033d7 Mon Sep 17 00:00:00 2001 From: Jonathan Budzenski Date: Mon, 15 Jul 2024 14:54:29 -0500 Subject: [PATCH 3/4] snapshot --- .buildkite/scripts/build_kibana.sh | 2 +- .buildkite/scripts/post_build_kibana.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/scripts/build_kibana.sh b/.buildkite/scripts/build_kibana.sh index 9c5551af29ab7..b9e35097bbbff 100755 --- a/.buildkite/scripts/build_kibana.sh +++ b/.buildkite/scripts/build_kibana.sh @@ -45,7 +45,7 @@ fi echo "--- Archive Kibana Distribution" version="$(jq -r '.version' package.json)" -linuxBuild="$KIBANA_DIR/target/kibana-$version-linux-x86_64.tar.gz" +linuxBuild="$KIBANA_DIR/target/kibana-$version-SNAPSHOT-linux-x86_64.tar.gz" installDir="$KIBANA_DIR/install/kibana" mkdir -p "$installDir" tar -xzf "$linuxBuild" -C "$installDir" --strip=1 diff --git a/.buildkite/scripts/post_build_kibana.sh b/.buildkite/scripts/post_build_kibana.sh index 4ae66b27d2feb..e33b1bdc164a1 100755 --- a/.buildkite/scripts/post_build_kibana.sh +++ b/.buildkite/scripts/post_build_kibana.sh @@ -21,6 +21,6 @@ echo "--- Upload Build Artifacts" # Moving to `target/` first will keep `buildkite-agent` from including directories in the artifact name cd "$KIBANA_DIR/target" version="$(jq -r '.version' package.json)" -cp "kibana-$version-linux-x86_64.tar.gz" kibana-default.tar.gz +cp "kibana-$version-SNAPSHOT-linux-x86_64.tar.gz" kibana-default.tar.gz buildkite-agent artifact upload "./*.tar.gz;./*.zip;./*.deb;./*.rpm" cd - From 642bf1427e70b8d4e5afa31b758503dc4125d951 Mon Sep 17 00:00:00 2001 From: Jonathan Budzenski Date: Mon, 15 Jul 2024 18:18:39 -0500 Subject: [PATCH 4/4] fix version --- .buildkite/scripts/post_build_kibana.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/scripts/post_build_kibana.sh b/.buildkite/scripts/post_build_kibana.sh index e33b1bdc164a1..2da629e29c158 100755 --- a/.buildkite/scripts/post_build_kibana.sh +++ b/.buildkite/scripts/post_build_kibana.sh @@ -19,8 +19,8 @@ fi echo "--- Upload Build Artifacts" # Moving to `target/` first will keep `buildkite-agent` from including directories in the artifact name -cd "$KIBANA_DIR/target" version="$(jq -r '.version' package.json)" +cd "$KIBANA_DIR/target" cp "kibana-$version-SNAPSHOT-linux-x86_64.tar.gz" kibana-default.tar.gz buildkite-agent artifact upload "./*.tar.gz;./*.zip;./*.deb;./*.rpm" cd -