Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
@@ -1,5 +1,5 @@
import process from 'process';
import { displayCLIWarning, internalExceptions, detectLibc } from '@cubejs-backend/shared';

Check warning on line 2 in rust/cubestore/js-wrapper/src/utils.ts

View workflow job for this annotation

GitHub Actions / lint

'displayCLIWarning' is defined but never used. Allowed unused vars must match /^_.*/u

Check warning on line 2 in rust/cubestore/js-wrapper/src/utils.ts

View workflow job for this annotation

GitHub Actions / lint

'internalExceptions' is defined but never used. Allowed unused vars must match /^_.*/u

export function getTarget(): string {
if (process.arch === 'x64') {
Expand Down Expand Up @@ -29,8 +29,7 @@
);
}
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 @@
}

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