Elgato_dark/void
1
0
Fork 0
mirror of https://github.com/voideditor/void synced 2026-05-24 09:58:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #349 from voideditor/github-workflow

Browse source 
fix vscodium patches
This commit is contained in:
Andrew Pareles 2025-03-27 15:56:10 -07:00 committed by GitHub
commit 70e89c8f20
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/darwin/sign.js
View file

@ -54,9 +54,11 @@ async function main(buildDir) {
...defaultOpts, ...defaultOpts,
// TODO(deepak1556): Incorrectly declared type in electron-osx-sign // TODO(deepak1556): Incorrectly declared type in electron-osx-sign
ignore: (filePath) => { ignore: (filePath) => {
const ext = path_1.default.extname(filePath);
return filePath.includes(gpuHelperAppName) || return filePath.includes(gpuHelperAppName) ||
filePath.includes(rendererHelperAppName) || filePath.includes(rendererHelperAppName) ||
filePath.includes(pluginHelperAppName); filePath.includes(pluginHelperAppName) ||
ext === '.asar' || ext === '.dat' || ext === '.gif' || ext === '.icns' || ext === '.ico' || ext === '.json' || ext === '.mp3' || ext === '.nib' || ext === '.pak' || ext === '.png' || ext === '.scpt' || ext === '.ttf' || ext === '.wasm' || ext === '.woff' || ext === '.woff2';
} }
}; };
const gpuHelperOpts = { const gpuHelperOpts = {

4
build/darwin/sign.ts
View file

@ -58,9 +58,11 @@ async function main(buildDir?: string): Promise<void> {
...defaultOpts, ...defaultOpts,
// TODO(deepak1556): Incorrectly declared type in electron-osx-sign // TODO(deepak1556): Incorrectly declared type in electron-osx-sign
ignore: (filePath: string) => { ignore: (filePath: string) => {
const ext = path.extname(filePath);
return filePath.includes(gpuHelperAppName) || return filePath.includes(gpuHelperAppName) ||
filePath.includes(rendererHelperAppName) || filePath.includes(rendererHelperAppName) ||
filePath.includes(pluginHelperAppName); filePath.includes(pluginHelperAppName) ||
ext === '.asar' || ext === '.dat' || ext === '.gif' || ext === '.icns' || ext === '.ico' || ext === '.json' || ext === '.mp3' || ext === '.nib' || ext === '.pak' || ext === '.png' || ext === '.scpt' || ext === '.ttf' || ext === '.wasm' || ext === '.woff' || ext === '.woff2';
} }
}; };

15
build/gulpfile.reh.js
View file

@ -154,9 +154,20 @@ function getNodeChecksum(expectedName) {
} }
function extractAlpinefromDocker(nodeVersion, platform, arch) { function extractAlpinefromDocker(nodeVersion, platform, arch) {
const imageName = arch === 'arm64' ? 'arm64v8/node' : 'node'; let imageName = 'node';
let dockerPlatform = '';
if (arch === 'arm64') {
imageName = 'arm64v8/node';
const architecture = cp.execSync(`docker info --format '{{json .Architecture}}'`, { encoding: 'utf8' }).trim();
if (architecture !== '"aarch64"') {
dockerPlatform = '--platform=linux/arm64';
}
}
log(`Downloading node.js ${nodeVersion} ${platform} ${arch} from docker image ${imageName}`); log(`Downloading node.js ${nodeVersion} ${platform} ${arch} from docker image ${imageName}`);
const contents = cp.execSync(`docker run --rm ${imageName}:${nodeVersion}-alpine /bin/sh -c 'cat \`which node\`'`, { maxBuffer: 100 * 1024 * 1024, encoding: 'buffer' }); const contents = cp.execSync(`docker run --rm ${dockerPlatform} ${imageName}:${nodeVersion}-alpine /bin/sh -c 'cat \`which node\`'`, { maxBuffer: 100 * 1024 * 1024, encoding: 'buffer' });
return es.readArray([new File({ path: 'node', contents, stat: { mode: parseInt('755', 8) } })]); return es.readArray([new File({ path: 'node', contents, stat: { mode: parseInt('755', 8) } })]);
} }

5
build/lib/builtInExtensions.js
View file

@ -85,10 +85,7 @@ function getExtensionDownloadStream(extension) {
if (extension.vsix) { if (extension.vsix) {
input = ext.fromVsix(path_1.default.join(root, extension.vsix), extension); input = ext.fromVsix(path_1.default.join(root, extension.vsix), extension);
} }
else if (productjson.extensionsGallery?.serviceUrl) { else { // Void - ext-from-gh.patch
input = ext.fromMarketplace(productjson.extensionsGallery.serviceUrl, extension);
}
else {
input = ext.fromGithub(extension); input = ext.fromGithub(extension);
} }
return input.pipe((0, gulp_rename_1.default)(p => p.dirname = `${extension.name}/${p.dirname}`)); return input.pipe((0, gulp_rename_1.default)(p => p.dirname = `${extension.name}/${p.dirname}`));

4
src/vs/workbench/electron-sandbox/window.ts
View file

@ -255,8 +255,8 @@ export class NativeWindow extends BaseWindow {
label: localize('downloadArmBuild', "Download"), label: localize('downloadArmBuild', "Download"),
run: () => { run: () => {
const quality = this.productService.quality; const quality = this.productService.quality;
const stableURL = 'https://code.visualstudio.com/docs/?dv=osx'; const stableURL = 'https://github.com/!!GH_REPO_PATH!!/releases/latest';
const insidersURL = 'https://code.visualstudio.com/docs/?dv=osx&build=insiders'; const insidersURL = 'https://github.com/!!GH_REPO_PATH!!-insiders/releases/latest';
this.openerService.open(quality === 'stable' ? stableURL : insidersURL); this.openerService.open(quality === 'stable' ? stableURL : insidersURL);
} }
}], }],