Skip to content
Open
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
27 changes: 19 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ jobs:
if: ${{ steps.meta.outputs.kind == 'npm-cli' }}
uses: dtolnay/rust-toolchain@stable
with:
targets: aarch64-apple-darwin
targets: aarch64-apple-darwin,x86_64-apple-darwin

- name: Install native build dependencies
if: ${{ steps.meta.outputs.kind == 'npm-cli' }}
Expand Down Expand Up @@ -264,21 +264,34 @@ jobs:

# ---------- Build (kind-specific) ----------

- name: Build root simdeck (arm64 native binary + client + simdeck-test)
- name: Build root simdeck (macOS arm64+x64 binaries + client + simdeck-test)
if: ${{ steps.meta.outputs.kind == 'npm-cli' }}
env:
SIMDECK_BUILD_TARGET: aarch64-apple-darwin
run: |
npm run build:cli
SIMDECK_BUILD_TARGET=aarch64-apple-darwin npm run build:cli
cp build/simdeck-bin build/simdeck-bin-darwin-arm64

SIMDECK_BUILD_TARGET=x86_64-apple-darwin npm run build:cli
cp build/simdeck-bin build/simdeck-bin-darwin-x64

lipo -create \
-output build/simdeck-bin \
build/simdeck-bin-darwin-arm64 \
build/simdeck-bin-darwin-x64

npm run build:client
npm run build:simdeck-test

- name: Verify CLI artifact is an arm64 Mach-O
- name: Verify CLI artifacts are macOS arm64+x64 binaries
if: ${{ steps.meta.outputs.kind == 'npm-cli' }}
run: |
test -x build/simdeck-bin
test -x build/simdeck-bin-darwin-arm64
test -x build/simdeck-bin-darwin-x64
file build/simdeck-bin
file build/simdeck-bin | grep -q 'arm64'
file build/simdeck-bin | grep -q 'x86_64'
file build/simdeck-bin-darwin-arm64 | grep -q 'arm64'
file build/simdeck-bin-darwin-x64 | grep -q 'x86_64'

# ---------- Apple codesign + notarize (root simdeck only) ----------

Expand Down Expand Up @@ -440,7 +453,6 @@ jobs:
NODE_AUTH_TOKEN: ""
DIST_TAG: ${{ steps.tag.outputs.dist_tag }}
PKG_DIR: ${{ steps.meta.outputs.dir }}
SIMDECK_BUILD_TARGET: aarch64-apple-darwin
run: |
set -euo pipefail
unset NODE_AUTH_TOKEN
Expand All @@ -459,7 +471,6 @@ jobs:
NODE_AUTH_TOKEN: ""
DIST_TAG: ${{ steps.tag.outputs.dist_tag }}
PKG_DIR: ${{ steps.meta.outputs.dir }}
SIMDECK_BUILD_TARGET: aarch64-apple-darwin
run: |
set -euo pipefail
unset NODE_AUTH_TOKEN
Expand Down
10 changes: 8 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@
"scripts/studio-provider-bridge.mjs",
"scripts/postinstall.mjs",
"build/simdeck-bin",
"build/simdeck-bin-darwin-arm64",
"build/simdeck-bin-darwin-x64",
"build/simdeck-bin-linux-arm64",
"build/simdeck-bin-linux-x64",
"packages/client/dist/",
"packages/simdeck-test/dist/"
],
Expand All @@ -33,10 +37,12 @@
"node": ">=18"
},
"os": [
"darwin"
"darwin",
"linux"
],
"cpu": [
"arm64"
"arm64",
"x64"
],
"publishConfig": {
"access": "public"
Expand Down
36 changes: 33 additions & 3 deletions packages/cli/bin/simdeck.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ const RECOVERABLE_RESTART_EXIT_CODE = 75;

const launcherDir = path.dirname(fileURLToPath(import.meta.url));
const packageRoot = findPackageRoot(launcherDir);
const binaryPath = path.join(packageRoot, "build", "simdeck-bin");
const binaryPath = resolveBinaryPath(packageRoot);
const childArgs = process.argv.slice(2);
const isServiceRun = childArgs[0] === "service" && childArgs[1] === "run";

if (process.platform !== "darwin") {
console.error("simdeck only supports macOS.");
if (!binaryPath) {
console.error("simdeck only supports macOS and Linux on arm64/x64.");
process.exit(1);
}

Expand All @@ -39,6 +39,36 @@ function findPackageRoot(startDir) {
}
}

function resolveBinaryPath(rootDir) {
const platform = process.platform;
const arch = process.arch;
const suffixByHost = {
"darwin-arm64": "darwin-arm64",
"darwin-x64": "darwin-x64",
"linux-arm64": "linux-arm64",
"linux-x64": "linux-x64",
};

const suffix = suffixByHost[`${platform}-${arch}`];
if (!suffix) {
return null;
}

const platformBinaryPath = path.join(
rootDir,
"build",
`simdeck-bin-${suffix}`,
);
if (existsSync(platformBinaryPath)) {
return platformBinaryPath;
}

const fallbackBinaryPath = path.join(rootDir, "build", "simdeck-bin");
return existsSync(fallbackBinaryPath)
? fallbackBinaryPath
: platformBinaryPath;
}

let child;
let terminating = false;

Expand Down
Loading