Skip to content

Commit 737fb60

Browse files
vieiraovr
andauthored
feat(cubestore): Build standalone aarch64-apple-darwin, thanks @vieira (#8950)
Fixes: #8949 --------- Co-authored-by: Dmitry Patsura <[email protected]>
1 parent 8e7c5c7 commit 737fb60

File tree

4 files changed

+25
-4
lines changed

4 files changed

+25
-4
lines changed

.github/workflows/publish.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -666,15 +666,16 @@ jobs:
666666
target:
667667
- x86_64-pc-windows-msvc
668668
- x86_64-apple-darwin
669+
- aarch64-apple-darwin
669670
include:
670671
- target: x86_64-pc-windows-msvc
671672
os: windows-2019
672673
executable_name: cubestored.exe
673674
strip: true
674675
# cubestored.exe: CantPackException: superfluous data between sections
675676
compress: false
676-
# Please use minimal possible version of macOS, because it produces constraint on libstdc++
677677
tar_executable: tar
678+
# Please use minimal possible version of macOS, because it produces constraint on libstdc++
678679
- target: x86_64-apple-darwin
679680
os: macos-12
680681
executable_name: cubestored
@@ -683,6 +684,14 @@ jobs:
683684
compress: false
684685
# bsd tar has a different format with Sparse files which breaks download script
685686
tar_executable: gtar
687+
- os: macos-14
688+
target: aarch64-apple-darwin
689+
executable_name: cubestored
690+
# upx has been disabled because it is crashing for macOS Ventura or above! It was disabled on 2024-09-05.
691+
strip: false
692+
compress: false
693+
# bsd tar has a different format with Sparse files which breaks download script
694+
tar_executable: gtar
686695
fail-fast: false
687696
permissions:
688697
contents: write

.github/workflows/rust-cubestore-master.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ jobs:
187187
target:
188188
- x86_64-pc-windows-msvc
189189
- x86_64-apple-darwin
190+
- aarch64-apple-darwin
190191
include:
191192
- os: windows-2019
192193
target: x86_64-pc-windows-msvc
@@ -201,6 +202,12 @@ jobs:
201202
# upx has been disabled because it is crashing for macOS Ventura or above! It was disabled on 2024-09-05.
202203
strip: false
203204
compress: false
205+
- os: macos-14
206+
target: aarch64-apple-darwin
207+
executable_name: cubestored
208+
# upx has been disabled because it is crashing for macOS Ventura or above! It was disabled on 2024-09-05.
209+
strip: false
210+
compress: false
204211
fail-fast: false
205212
steps:
206213
- uses: actions/checkout@v4

.github/workflows/rust-cubestore.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ jobs:
118118
target:
119119
- x86_64-pc-windows-msvc
120120
- x86_64-apple-darwin
121+
- aarch64-apple-darwin
121122
include:
122123
- os: windows-2019
123124
target: x86_64-pc-windows-msvc
@@ -132,6 +133,12 @@ jobs:
132133
# upx has been disabled because it is crashing for macOS Ventura or above! It was disabled on 2024-09-05.
133134
strip: false
134135
compress: false
136+
- os: macos-14
137+
target: aarch64-apple-darwin
138+
executable_name: cubestored
139+
# upx has been disabled because it is crashing for macOS Ventura or above! It was disabled on 2024-09-05.
140+
strip: false
141+
compress: false
135142
fail-fast: false
136143
steps:
137144
- uses: actions/checkout@v4

rust/cubestore/js-wrapper/src/utils.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ export function getTarget(): string {
2929
);
3030
}
3131
case 'darwin':
32-
// Rosetta 2 is required
33-
return 'x86_64-apple-darwin';
32+
return 'aarch64-apple-darwin';
3433
default:
3534
throw new Error(
3635
`You are using ${process.env} platform on arm64 which is not supported by Cube Store`,
@@ -49,7 +48,6 @@ export function isCubeStoreSupported(): boolean {
4948
}
5049

5150
if (process.arch === 'arm64') {
52-
// We mark darwin as supported, but it uses Rosetta 2
5351
if (process.platform === 'darwin') {
5452
return true;
5553
}

0 commit comments

Comments
 (0)