Allow disabling of patch checks

This commit is contained in:
trickypr 2022-04-12 15:49:22 +10:00
parent c69a0300ed
commit 0766066cd7
2 changed files with 10 additions and 16 deletions

View file

@ -16,15 +16,16 @@ export const commands: Cmd[] = [
description: description:
'Build the melon app. Specify the OS param for cross-platform builds.', 'Build the melon app. Specify the OS param for cross-platform builds.',
options: [ options: [
{
arg: '--a, --arch <architecture>',
description: 'Specify architecture for build',
},
{ {
arg: '--u, --ui', arg: '--u, --ui',
description: description:
'Only builds the ui. Faster but not as powerful as a regular build.', 'Only builds the ui. Faster but not as powerful as a regular build.',
}, },
{
arg: '--skip-patch-check',
description:
"Doesn't check to see if all of the patches have been applied",
},
], ],
requestController: async () => (await import('./commands/build')).build, requestController: async () => (await import('./commands/build')).build,
}, },

View file

@ -16,7 +16,7 @@ const platform: Record<string, string> = {
linux: 'linux', linux: 'linux',
} }
const applyConfig = async (os: string, arch: string) => { const applyConfig = async (os: string) => {
log.info('Applying mozconfig...') log.info('Applying mozconfig...')
let changeset let changeset
@ -55,14 +55,7 @@ const applyConfig = async (os: string, arch: string) => {
) )
const osConfig = stringTemplate( const osConfig = stringTemplate(
readFileSync( readFileSync(resolve(CONFIGS_DIR, os, 'mozconfig'), 'utf-8'),
resolve(
CONFIGS_DIR,
os,
arch === 'i686' ? 'mozconfig-i686' : 'mozconfig'
),
'utf-8'
),
templateOptions templateOptions
) )
@ -144,8 +137,8 @@ const success = (date: number) => {
} }
interface Options { interface Options {
arch: string
ui: boolean ui: boolean
skipPatchCheck: boolean
} }
export const build = async (options: Options): Promise<void> => { export const build = async (options: Options): Promise<void> => {
@ -156,9 +149,9 @@ export const build = async (options: Options): Promise<void> => {
const prettyHost = platform[process.platform] const prettyHost = platform[process.platform]
if (BUILD_TARGETS.includes(prettyHost)) { if (BUILD_TARGETS.includes(prettyHost)) {
await patchCheck() if (!options.skipPatchCheck) await patchCheck()
await applyConfig(prettyHost, options.arch) await applyConfig(prettyHost)
log.info('Starting build...') log.info('Starting build...')