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
8 changes: 5 additions & 3 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -229,18 +229,20 @@ jobs:
- name: Stage platform binaries
run: |
set -euo pipefail
mkdir -p npm/darwin-x64/bin npm/darwin-arm64/bin npm/linux-x64/bin npm/linux-arm64/bin npm/win32-x64/bin
mkdir -p npm/darwin-x64/bin npm/darwin-arm64/bin npm/linux-x64/bin npm/linux-arm64/bin npm/linux-x64-musl/bin npm/linux-arm64-musl/bin npm/win32-x64/bin
cp artifacts/release-squawk-darwin-x64/squawk-darwin-x64 npm/darwin-x64/bin/squawk
cp artifacts/release-squawk-darwin-arm64/squawk-darwin-arm64 npm/darwin-arm64/bin/squawk
cp artifacts/release-squawk-linux-x64/squawk-linux-x64 npm/linux-x64/bin/squawk
cp artifacts/release-squawk-linux-arm64/squawk-linux-arm64 npm/linux-arm64/bin/squawk
cp artifacts/release-squawk-linux-musl-x64/squawk-linux-musl-x64 npm/linux-x64-musl/bin/squawk
cp artifacts/release-squawk-linux-musl-arm64/squawk-linux-musl-arm64 npm/linux-arm64-musl/bin/squawk
cp artifacts/release-squawk-windows-x64.exe/squawk-windows-x64.exe npm/win32-x64/bin/squawk.exe
chmod +x npm/darwin-x64/bin/squawk npm/darwin-arm64/bin/squawk npm/linux-x64/bin/squawk npm/linux-arm64/bin/squawk
chmod +x npm/darwin-x64/bin/squawk npm/darwin-arm64/bin/squawk npm/linux-x64/bin/squawk npm/linux-arm64/bin/squawk npm/linux-x64-musl/bin/squawk npm/linux-arm64-musl/bin/squawk

- name: Publish packages
run: |
set -euo pipefail
for pkg in darwin-x64 darwin-arm64 linux-x64 linux-arm64 win32-x64; do
for pkg in darwin-x64 darwin-arm64 linux-x64 linux-arm64 linux-x64-musl linux-arm64-musl win32-x64; do
(cd "npm/$pkg" && npm publish --access public --provenance)
done
npm publish --access public --provenance
Expand Down
2 changes: 2 additions & 0 deletions crates/xtask/src/update_version.rs
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,9 @@ fn update_versions(sh: &Shell, v: &str) -> Result<()> {
"darwin-arm64",
"darwin-x64",
"linux-arm64",
"linux-arm64-musl",
"linux-x64",
"linux-x64-musl",
"win32-x64",
] {
replace_in_file(
Expand Down
20 changes: 19 additions & 1 deletion js/index.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,35 @@
"use strict"

const childProcess = require("child_process")
const fs = require("fs")

/** @type {Record<string, string>} */
const PLATFORM_PACKAGES = {
"darwin-x64": "@squawk-cli/darwin-x64",
"darwin-arm64": "@squawk-cli/darwin-arm64",
"linux-x64": "@squawk-cli/linux-x64",
"linux-arm64": "@squawk-cli/linux-arm64",
"linux-x64-musl": "@squawk-cli/linux-x64-musl",
"linux-arm64-musl": "@squawk-cli/linux-arm64-musl",
"win32-x64": "@squawk-cli/win32-x64",
}

function isMusl() {
// same order as detect-libc, process.report can be slow
try {
return fs.readFileSync("/usr/bin/ldd", "utf8").includes("musl")
} catch {
/** @type {any} */
const report = process.report?.getReport()
return !report?.header.glibcVersionRuntime
}
}

function getBinaryPath() {
const key = `${process.platform}-${process.arch}`
let key = `${process.platform}-${process.arch}`
if (process.platform === "linux" && isMusl()) {
key += "-musl"
}
const pkg = PLATFORM_PACKAGES[key]
if (!pkg) {
throw new Error(
Expand Down Expand Up @@ -50,6 +67,7 @@ function run() {
child.on("error", (err) => {
console.error("error: failed to invoke squawk")
console.error(err.stack)
process.exit(1)
})

child.on("exit", (code) => {
Expand Down
19 changes: 19 additions & 0 deletions npm/linux-arm64-musl/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"name": "@squawk-cli/linux-arm64-musl",
"version": "2.66.0",
"description": "squawk-cli binary for linux-arm64-musl",
"repository": "git@github.com:sbdchd/squawk.git",
"license": "(Apache-2.0 OR MIT)",
"os": [
"linux"
],
"cpu": [
"arm64"
],
"libc": [
"musl"
],
"files": [
"bin/squawk"
]
}
3 changes: 3 additions & 0 deletions npm/linux-arm64/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
"cpu": [
"arm64"
],
"libc": [
"glibc"
],
"files": [
"bin/squawk"
]
Expand Down
19 changes: 19 additions & 0 deletions npm/linux-x64-musl/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"name": "@squawk-cli/linux-x64-musl",
"version": "2.66.0",
"description": "squawk-cli binary for linux-x64-musl",
"repository": "git@github.com:sbdchd/squawk.git",
"license": "(Apache-2.0 OR MIT)",
"os": [
"linux"
],
"cpu": [
"x64"
],
"libc": [
"musl"
],
"files": [
"bin/squawk"
]
}
3 changes: 3 additions & 0 deletions npm/linux-x64/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
"cpu": [
"x64"
],
"libc": [
"glibc"
],
"files": [
"bin/squawk"
]
Expand Down
4 changes: 4 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@
"@squawk-cli/darwin-arm64": "2.66.0",
"@squawk-cli/darwin-x64": "2.66.0",
"@squawk-cli/linux-arm64": "2.66.0",
"@squawk-cli/linux-arm64-musl": "2.66.0",
"@squawk-cli/linux-x64": "2.66.0",
"@squawk-cli/linux-x64-musl": "2.66.0",
"@squawk-cli/win32-x64": "2.66.0"
},
"volta": {
Expand All @@ -45,7 +47,9 @@
"@squawk-cli/darwin-arm64",
"@squawk-cli/darwin-x64",
"@squawk-cli/linux-arm64",
"@squawk-cli/linux-arm64-musl",
"@squawk-cli/linux-x64",
"@squawk-cli/linux-x64-musl",
"@squawk-cli/win32-x64"
]
}
Expand Down
2 changes: 2 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading