github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 09:19:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

[8.17] Fix build_snapshot for Apple silicon laptops (#204951) (#205749)

Browse source 
# Backport

This will backport the following commits from `main` to `8.17`:
- [Fix build_snapshot for Apple silicon laptops
(#204951)](https://github.com/elastic/kibana/pull/204951)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Patryk
Kopyciński","email":"contact@patrykkopycinski.com"},"sourceCommit":{"committedDate":"2025-01-07T14:09:46Z","message":"Fix
build_snapshot for Apple silicon laptops (#204951)\n\n##
Summary\r\n\r\n`build_snapshot` was using wrong Gradle task when
building ES from\r\nsource for Apple silicon
laptops\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"d86a966ceb71b00f3d44baf9cabacc92da9abab0","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","backport:prev-major"],"title":"Fix
build_snapshot for Apple silicon
laptops","number":204951,"url":"https://github.com/elastic/kibana/pull/204951","mergeCommit":{"message":"Fix
build_snapshot for Apple silicon laptops (#204951)\n\n##
Summary\r\n\r\n`build_snapshot` was using wrong Gradle task when
building ES from\r\nsource for Apple silicon
laptops\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"d86a966ceb71b00f3d44baf9cabacc92da9abab0"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/204951","number":204951,"mergeCommit":{"message":"Fix
build_snapshot for Apple silicon laptops (#204951)\n\n##
Summary\r\n\r\n`build_snapshot` was using wrong Gradle task when
building ES from\r\nsource for Apple silicon
laptops\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"d86a966ceb71b00f3d44baf9cabacc92da9abab0"}}]}]
BACKPORT-->

Co-authored-by: Patryk Kopyciński <contact@patrykkopycinski.com>
This commit is contained in:
Kibana Machine 2025-01-08 03:04:38 +11:00 • committed by GitHub
parent b9deab0ad5
commit 688dd2946a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
packages/kbn-es/src/utils/build_snapshot.ts
View file

@ -67,7 +67,12 @@ export async function buildSnapshot({
export function archiveForPlatform(platform: NodeJS.Platform, license: string) {
switch (platform) {
case 'darwin':
return { format: 'tar', ext: 'tar.gz', task: 'darwin-tar', platform: 'darwin' };
return {
format: 'tar',
ext: 'tar.gz',
task: os.arch() === 'arm64' ? 'darwin-aarch64-tar' : 'darwin-tar',
platform: 'darwin',
};
case 'win32':
return { format: 'zip', ext: 'zip', task: 'windows-zip', platform: 'windows' };
case 'linux':