Skip to content

Commit

Permalink
feat(cubestore): Build standalone aarch64-apple-darwin, thanks @vieira (
Browse files Browse the repository at this point in the history
#8950)

Fixes: #8949

---------

Co-authored-by: Dmitry Patsura <zaets28rus@gmail.com>
  • Loading branch information
vieira and ovr authored Nov 13, 2024
1 parent 8e7c5c7 commit 737fb60
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 4 deletions.
11 changes: 10 additions & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -666,15 +666,16 @@ jobs:
target:
- x86_64-pc-windows-msvc
- x86_64-apple-darwin
- aarch64-apple-darwin
include:
- target: x86_64-pc-windows-msvc
os: windows-2019
executable_name: cubestored.exe
strip: true
# cubestored.exe: CantPackException: superfluous data between sections
compress: false
# Please use minimal possible version of macOS, because it produces constraint on libstdc++
tar_executable: tar
# Please use minimal possible version of macOS, because it produces constraint on libstdc++
- target: x86_64-apple-darwin
os: macos-12
executable_name: cubestored
Expand All @@ -683,6 +684,14 @@ jobs:
compress: false
# bsd tar has a different format with Sparse files which breaks download script
tar_executable: gtar
- os: macos-14
target: aarch64-apple-darwin
executable_name: cubestored
# upx has been disabled because it is crashing for macOS Ventura or above! It was disabled on 2024-09-05.
strip: false
compress: false
# bsd tar has a different format with Sparse files which breaks download script
tar_executable: gtar
fail-fast: false
permissions:
contents: write
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/rust-cubestore-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ jobs:
target:
- x86_64-pc-windows-msvc
- x86_64-apple-darwin
- aarch64-apple-darwin
include:
- os: windows-2019
target: x86_64-pc-windows-msvc
Expand All @@ -201,6 +202,12 @@ jobs:
# upx has been disabled because it is crashing for macOS Ventura or above! It was disabled on 2024-09-05.
strip: false
compress: false
- os: macos-14
target: aarch64-apple-darwin
executable_name: cubestored
# upx has been disabled because it is crashing for macOS Ventura or above! It was disabled on 2024-09-05.
strip: false
compress: false
fail-fast: false
steps:
- uses: actions/checkout@v4
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/rust-cubestore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ jobs:
target:
- x86_64-pc-windows-msvc
- x86_64-apple-darwin
- aarch64-apple-darwin
include:
- os: windows-2019
target: x86_64-pc-windows-msvc
Expand All @@ -132,6 +133,12 @@ jobs:
# upx has been disabled because it is crashing for macOS Ventura or above! It was disabled on 2024-09-05.
strip: false
compress: false
- os: macos-14
target: aarch64-apple-darwin
executable_name: cubestored
# upx has been disabled because it is crashing for macOS Ventura or above! It was disabled on 2024-09-05.
strip: false
compress: false
fail-fast: false
steps:
- uses: actions/checkout@v4
Expand Down
4 changes: 1 addition & 3 deletions rust/cubestore/js-wrapper/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ export function getTarget(): string {
);
}
case 'darwin':
// Rosetta 2 is required
return 'x86_64-apple-darwin';
return 'aarch64-apple-darwin';
default:
throw new Error(
`You are using ${process.env} platform on arm64 which is not supported by Cube Store`,
Expand All @@ -49,7 +48,6 @@ export function isCubeStoreSupported(): boolean {
}

if (process.arch === 'arm64') {
// We mark darwin as supported, but it uses Rosetta 2
if (process.platform === 'darwin') {
return true;
}
Expand Down

0 comments on commit 737fb60

Please sign in to comment.