bigjango13
/
minecraft-pi-reborn
forked from minecraft-pi-reborn/minecraft-pi-reborn
1
0
Fork 0
Code Pull Requests Activity

Fix CI

This commit is contained in:
TheBrokenRail 2024-02-04 01:31:41 -05:00
parent 930d0120f3
commit 7ba9daa84e
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitea/workflows/build.yml
View File

@ -82,6 +82,7 @@ jobs:
- name: Build SDK - name: Build SDK
run: | run: |
./scripts/build.mjs none client host ./scripts/build.mjs none client host
export _MCPI_SKIP_ROOT_CHECK=1
./out/client/host/usr/bin/minecraft-pi-reborn-client --copy-sdk ./out/client/host/usr/bin/minecraft-pi-reborn-client --copy-sdk
# Build Example Mods # Build Example Mods
- name: Build Example Mods - name: Build Example Mods

23
scripts/build.mjs
View File

@ -94,7 +94,7 @@ if (packageType === PackageTypes.Flatpak && architecture !== Architecture.Host)
} }
// CMake Build Options // CMake Build Options
const options = {}; const options = new Map();
// Other Arguments // Other Arguments
let clean = false; let clean = false;
@ -113,7 +113,7 @@ for (; argIndex < process.argv.length; argIndex++) {
if (!/^[a-zA-Z_]+$/.test(name) || name.length === 0) { if (!/^[a-zA-Z_]+$/.test(name) || name.length === 0) {
err('Invalid Build Option Name: ' + name); err('Invalid Build Option Name: ' + name);
} }
options[name] = value; options.set(name, value);
} else if (arg === '--clean') { } else if (arg === '--clean') {
// Remove Existing Build Directory // Remove Existing Build Directory
clean = true; clean = true;
@ -137,7 +137,8 @@ function updateDir(dir) {
} }
build = updateDir(build); build = updateDir(build);
let cleanOut = false; let cleanOut = false;
if (packageType === PackageTypes.None) { // AppImages Are Placed Directly In ./out
if (packageType !== PackageTypes.AppImage) {
cleanOut = true; cleanOut = true;
out = updateDir(out); out = updateDir(out);
} }
@ -146,13 +147,13 @@ if (packageType === PackageTypes.None) {
function toCmakeBool(val) { function toCmakeBool(val) {
return val ? 'ON' : 'OFF'; return val ? 'ON' : 'OFF';
} }
options['MCPI_SERVER_MODE'] = toCmakeBool(variant === Variants.Server); options.set('MCPI_SERVER_MODE', toCmakeBool(variant === Variants.Server));
options['MCPI_IS_APPIMAGE_BUILD'] = toCmakeBool(packageType === PackageTypes.AppImage); options.set('MCPI_IS_APPIMAGE_BUILD', toCmakeBool(packageType === PackageTypes.AppImage));
options['MCPI_IS_FLATPAK_BUILD'] = toCmakeBool(packageType === PackageTypes.Flatpak); options.set('MCPI_IS_FLATPAK_BUILD', toCmakeBool(packageType === PackageTypes.Flatpak));
if (architecture !== Architectures.Host) { if (architecture !== Architectures.Host) {
options['CMAKE_TOOLCHAIN_FILE'] = path.join(root, 'cmake', 'toolchain', architecture.name + '-toolchain.cmake'); options.set('CMAKE_TOOLCHAIN_FILE', path.join(root, 'cmake', 'toolchain', architecture.name + '-toolchain.cmake'));
} else { } else {
delete options['CMAKE_TOOLCHAIN_FILE']; options.delete('CMAKE_TOOLCHAIN_FILE');
} }
// Make Build Directory // Make Build Directory
@ -177,9 +178,9 @@ function run(command) {
} }
} }
const cmake = ['cmake', '-GNinja']; const cmake = ['cmake', '-GNinja'];
for (const option in options) { options.forEach((value, key, map) => {
cmake.push(`-D${option}=${options[option]}`); cmake.push(`-D${key}=${value}`);
} });
cmake.push(root); cmake.push(root);
run(cmake); run(cmake);