m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-22 18:00:18 +01:00
Code

Fix build types not overriding the manifest (#19027)

Browse Source
This commit is contained in:
Olaf Tomalka 2023-05-05 18:40:43 +02:00 committed by GitHub
parent b60b9f441f
commit 82f01a6b44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builds.yml
View File

@ -21,6 +21,8 @@ buildTypes:
- SEGMENT_PROD_WRITE_KEY - SEGMENT_PROD_WRITE_KEY
- INFURA_ENV_KEY_REF: INFURA_PROD_PROJECT_ID - INFURA_ENV_KEY_REF: INFURA_PROD_PROJECT_ID
- SEGMENT_WRITE_KEY_REF: SEGMENT_PROD_WRITE_KEY - SEGMENT_WRITE_KEY_REF: SEGMENT_PROD_WRITE_KEY
# Main build uses the default browser manifest
manifestOverrides: false
beta: beta:
features: features:
@ -34,7 +36,7 @@ buildTypes:
# eg. instead of 10.25.0 -> 10.25.0-beta.2 # eg. instead of 10.25.0 -> 10.25.0-beta.2
isPrerelease: true isPrerelease: true
# Folder which contains overrides to browser manifests # Folder which contains overrides to browser manifests
manifestOverrides: ./app/build-types/mmi/manifest/ manifestOverrides: ./app/build-types/beta/manifest/
flask: flask:
# Code surrounded using code fences for that feature # Code surrounded using code fences for that feature
@ -53,6 +55,7 @@ buildTypes:
- INFURA_ENV_KEY_REF: INFURA_FLASK_PROJECT_ID - INFURA_ENV_KEY_REF: INFURA_FLASK_PROJECT_ID
- SEGMENT_WRITE_KEY_REF: SEGMENT_FLASK_WRITE_KEY - SEGMENT_WRITE_KEY_REF: SEGMENT_FLASK_WRITE_KEY
isPrerelease: true isPrerelease: true
manifestOverrides: ./app/build-types/flask/manifest/
desktop: desktop:
features: features:
@ -69,6 +72,7 @@ buildTypes:
- INFURA_ENV_KEY_REF: INFURA_FLASK_PROJECT_ID - INFURA_ENV_KEY_REF: INFURA_FLASK_PROJECT_ID
- SEGMENT_WRITE_KEY_REF: SEGMENT_FLASK_WRITE_KEY - SEGMENT_WRITE_KEY_REF: SEGMENT_FLASK_WRITE_KEY
isPrerelease: true isPrerelease: true
manifestOverrides: ./app/build-types/desktop/manifest/
mmi: mmi:
features: features:
@ -83,6 +87,7 @@ buildTypes:
# For some reason, MMI uses this type of versioning # For some reason, MMI uses this type of versioning
# Leaving it on for backwards compatibility # Leaving it on for backwards compatibility
isPrerelease: true isPrerelease: true
manifestOverrides: ./app/build-types/mmi/manifest/
# Build types are composed of a set of features. # Build types are composed of a set of features.
# Each feature can have code fences that add new code # Each feature can have code fences that add new code

2
development/build/manifest.js
View File

@ -176,7 +176,7 @@ async function getBuildModifications(buildType, platform) {
} }
const overridesPath = buildConfig.buildTypes[buildType].manifestOverrides; const overridesPath = buildConfig.buildTypes[buildType].manifestOverrides;
if (overridesPath === undefined) { if (!overridesPath) {
return {}; return {};
} }

3
development/lib/build-type.js
View File

@ -16,6 +16,7 @@ const {
validate, validate,
nullable, nullable,
never, never,
literal,
} = require('superstruct'); } = require('superstruct');
const yaml = require('js-yaml'); const yaml = require('js-yaml');
const { uniqWith } = require('lodash'); const { uniqWith } = require('lodash');
@ -65,7 +66,7 @@ const BuildTypeStruct = object({
features: optional(unique(array(string()))), features: optional(unique(array(string()))),
env: optional(EnvArrayStruct), env: optional(EnvArrayStruct),
isPrerelease: optional(boolean()), isPrerelease: optional(boolean()),
manifestOverrides: optional(string()), manifestOverrides: union([string(), literal(false)]),
}); });
const CopyAssetStruct = object({ src: string(), dest: string() }); const CopyAssetStruct = object({ src: string(), dest: string() });