Skip to content

fix: ensure spawn-helper is executable for macos prebuilds #866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tyriar merged 7 commits into from
Jan 13, 2026
+26 −22
Merged

fix: ensure spawn-helper is executable for macos prebuilds #866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
57c0974
fix: ensure spawn-helper is executable for macos prebuilds
devm33 Jan 10, 2026
1a1452c
fix: Use authenticated download for sysroot to avoid rate limiting
devm33 Jan 10, 2026
e80e3f8
fix: add parsing to reduce flakiness on macOS
devm33 Jan 10, 2026
29f9e73
chore: set -e to make failure point clear
devm33 Jan 10, 2026
913fc14
chore: direct debug logs to stderr
devm33 Jan 10, 2026
5a60c95
chore: add log for token use in downloading sysroot
devm33 Jan 10, 2026
6a7f206
Revert "Ensure 755 permissions on prebuild spawn-helper"
devm33 Jan 10, 2026
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
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ jobs:
- name: Install sysroot
if: runner.os == 'Linux'
run: |
set -eo pipefail
sudo apt-get update -qq
if [ "${{ steps.arch.outputs.arch }}" = "arm64" ]; then
sudo apt-get install -y gcc-10-aarch64-linux-gnu g++-10-aarch64-linux-gnu
Expand All @@ -49,6 +50,9 @@ jobs:
SYSROOT_PATH=$(node scripts/linux/install-sysroot.js ${{ steps.arch.outputs.arch }} | grep "SYSROOT_PATH=" | cut -d= -f2)
echo "SYSROOT_PATH=$SYSROOT_PATH" >> $GITHUB_ENV
echo "Sysroot path set to: $SYSROOT_PATH"
env:
# Set github token for authenticated sysroot download
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Install dependencies and build
run: npm ci
Expand Down
4 changes: 4 additions & 0 deletions publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ extends:
- pwsh: |
Get-ChildItem -Path . -Recurse -Directory -Name "_manifest" | Remove-Item -Recurse -Force
displayName: 'Delete _manifest folders'
- bash: chmod +x prebuilds/darwin-*/spawn-helper
displayName: 'Ensure spawn-helper is executable'
- script: npm ci
displayName: 'Install dependencies and build'
# The following script leaves the version unchanged for
Expand All @@ -70,6 +72,8 @@ extends:
branchName: 'refs/heads/main'
artifactName: 'prebuilds'
targetPath: 'prebuilds'
- bash: chmod +x prebuilds/darwin-*/spawn-helper
displayName: 'Ensure spawn-helper is executable'
- script: npm ci
displayName: 'Install dependencies and build'
- script: npm test
Expand Down
17 changes: 9 additions & 8 deletions scripts/linux/install-sysroot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ const ghApiHeaders = {

if (process.env.GITHUB_TOKEN) {
ghApiHeaders.Authorization = 'Basic ' + Buffer.from(process.env.GITHUB_TOKEN).toString('base64');
console.error('Using GITHUB_TOKEN for authenticated requests to GitHub API.');
}

const ghDownloadHeaders = {
Expand Down Expand Up @@ -48,29 +49,29 @@ async function fetchUrl(options, retries = 10, retryDelay = 1000) {
signal: controller.signal
});
if (response.ok && (response.status >= 200 && response.status < 300)) {
console.log(`Fetch completed: Status ${response.status}.`);
console.error(`Fetch completed: Status ${response.status}.`);
const contents = Buffer.from(await response.arrayBuffer());
const asset = JSON.parse(contents.toString()).assets.find((a) => a.name === options.assetName);
if (!asset) {
throw new Error(`Could not find asset in release of Microsoft/vscode-linux-build-agent @ ${version}`);
}
console.log(`Found asset ${options.assetName} @ ${asset.url}.`);
console.error(`Found asset ${options.assetName} @ ${asset.url}.`);
const assetResponse = await fetch(asset.url, {
headers: ghDownloadHeaders
});
if (assetResponse.ok && (assetResponse.status >= 200 && assetResponse.status < 300)) {
const assetContents = Buffer.from(await assetResponse.arrayBuffer());
console.log(`Fetched response body buffer: ${assetContents.byteLength} bytes`);
console.error(`Fetched response body buffer: ${assetContents.byteLength} bytes`);
if (options.checksumSha256) {
const actualSHA256Checksum = createHash('sha256').update(assetContents).digest('hex');
if (actualSHA256Checksum !== options.checksumSha256) {
throw new Error(`Checksum mismatch for ${asset.url} (expected ${options.checksumSha256}, actual ${actualSHA256Checksum})`);
}
}
console.log(`Verified SHA256 checksums match for ${asset.url}`);
console.error(`Verified SHA256 checksums match for ${asset.url}`);
const tarCommand = `tar -xz -C ${options.dest}`;
execSync(tarCommand, { input: assetContents });
console.log(`Fetch complete!`);
console.error(`Fetch complete!`);
return;
}
throw new Error(`Request ${asset.url} failed with status code: ${assetResponse.status}`);
Expand All @@ -81,7 +82,7 @@ async function fetchUrl(options, retries = 10, retryDelay = 1000) {
}
} catch (e) {
if (retries > 0) {
console.log(`Fetching failed: ${e}`);
console.error(`Fetching failed: ${e}`);
await new Promise(resolve => setTimeout(resolve, retryDelay));
return fetchUrl(options, retries - 1, retryDelay);
}
Expand Down Expand Up @@ -122,7 +123,7 @@ async function getSysroot(arch) {
return result;
}

console.log(`Installing ${arch} root image: ${sysroot}`);
console.error(`Installing ${arch} root image: ${sysroot}`);
fs.rmSync(sysroot, { recursive: true, force: true });
fs.mkdirSync(sysroot, { recursive: true });

Expand All @@ -139,7 +140,7 @@ async function getSysroot(arch) {

async function main() {
const arch = process.argv[2] || process.env.ARCH || 'x64';
console.log(`Installing sysroot for architecture: ${arch}`);
console.error(`Installing sysroot for architecture: ${arch}`);

try {
const sysrootPath = await getSysroot(arch);
Expand Down
8 changes: 0 additions & 8 deletions scripts/prebuild.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,4 @@ if (!fs.existsSync(PREBUILD_DIR)) {
process.exit(1);
}

// Ensure spawn-helper has execute permission (may be stripped by npm pack)
if (process.platform === 'darwin') {
const spawnHelper = path.join(PREBUILD_DIR, 'spawn-helper');
if (fs.existsSync(spawnHelper)) {
fs.chmodSync(spawnHelper, 0o755);
}
}

process.exit(0);
15 changes: 9 additions & 6 deletions src/unixTerminal.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,12 +280,15 @@ if (process.platform !== 'win32') {
let sub = '';
let pid = '';
p.stdout.on('data', (data) => {
if (!data.toString().indexOf('title')) {
sub = data.toString().split(' ')[1].slice(0, -1);
} else if (!data.toString().indexOf('ready')) {
pid = data.toString().split(' ')[1].slice(0, -1);
process.kill(parseInt(pid), 'SIGINT');
p.kill('SIGINT');
const lines = data.toString().split('\n');
for (const line of lines) {
if (line.startsWith('title ')) {
sub = line.split(' ')[1];
} else if (line.startsWith('ready ')) {
pid = line.split(' ')[1];
process.kill(parseInt(pid), 'SIGINT');
p.kill('SIGINT');
}
}
});
p.on('exit', () => {
Expand Down