github/vim-ale
1
0
Fork 0
mirror of https://github.com/webinstall/webi-installers.git synced 2026-08-19 12:06:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: allow 'posix_2017' and 'posix_2024' for non-windows OSes

Browse Source
This commit is contained in:
AJ ONeal
2024-09-13 08:33:48 +00:00
parent 5bb2832ad9
commit 8f39617bcd
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_webi/builds-cacher.js
+2 -2
View File
@@ -726,9 +726,9 @@ BuildsCacher.create = function ({ ALL_TERMS, installers, caches }) {
if (hostTarget.os === 'windows') {
oses = ['ANYOS', 'windows'];
} else if (hostTarget.os === 'android') {
oses = ['ANYOS', 'posix_2017', 'android', 'linux'];
oses = ['ANYOS', 'posix_2017', 'posix_2024', 'android', 'linux'];
} else {
oses = ['ANYOS', 'posix_2017', hostTarget.os];
oses = ['ANYOS', 'posix_2017', 'posix_2024', hostTarget.os];
}
let waterfall = HostTargets.WATERFALL[hostTarget.os] || {};
_webi/serve-installer.js
+13
View File
@@ -132,10 +132,23 @@ InstallerServer.helper = async function ({
formats: projInfo.formats,
};
// TODO .findMatchingPackages() should probably account for this
let hasOs = projInfo.oses.includes(hostTarget.os);
let maybePosix = !hasOs && hostTarget.os !== 'windows';
if (maybePosix) {
let posixes = ['posix_2017', 'posix_2024'];
for (let posixYear of posixes) {
let hasPosix = projInfo.oses.includes(posixYear);
if (hasPosix) {
hasOs = true;
break;
}
}
}
if (!hasOs) {
hasOs = projInfo.oses.includes('ANYOS');
}
if (!hasOs) {
let pkg1 = Object.assign(buildTargetInfo, errPackage);
return [pkg1, tmplParams];