Add --skipSigning option to build command (#473)

Co-authored-by: André Cipriani Bandarra <andreban@google.com>
GoogleChromeLabs · Feb 25, 2021 · 1b278d3 · 1b278d3
1 parent 2eee55a
commit 1b278d3
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 9 deletions.
diff --git a/packages/cli/README.md b/packages/cli/README.md
@@ -113,11 +113,12 @@ Set `BUBBLEWRAP_KEYSTORE_PASSWORD` for the key store password and `BUBBLEWRAP_KE
 Usage:
 
 ```
-bubblewrap build [--skipPwaValidation] [--manifest="<path-twa-manifest>"]
+bubblewrap build [--skipPwaValidation] [--skipSigning] [--manifest="<path-twa-manifest>"]
 ```
 
 Options: 
   - `--skipPwaValidation`: skips validating the wrapped PWA against the Quality Criteria.
+  - `--skipSigning`: skips signing the built APK and App Bundle.
   - `--manifest`: directory where the client should look for `twa-manifest.json`.
 
 

diff --git a/packages/cli/src/lib/cmds/build.ts b/packages/cli/src/lib/cmds/build.ts
@@ -172,19 +172,36 @@ class Build {
 
     const manifestFile = this.args.manifest || path.join(process.cwd(), TWA_MANIFEST_FILE_NAME);
     const twaManifest = await TwaManifest.fromFile(manifestFile);
-    const passwords = await this.getPasswords(twaManifest.signingKey);
+
+    let passwords = null;
+    if (!this.args.skipSigning) {
+      passwords = await this.getPasswords(twaManifest.signingKey);
+    }
 
     // Builds the Android Studio Project
     this.prompt.printMessage(messages.messageBuildingApp);
+
     await this.buildApk();
-    await this.signApk(twaManifest.signingKey, passwords);
-    this.prompt.printMessage(messages.messageApkSucess(APK_SIGNED_FILE_NAME));
+    if (passwords) {
+      await this.signApk(twaManifest.signingKey, passwords);
+    }
+    const apkFileName = this.args.skipSigning ?
+      APK_ALIGNED_FILE_NAME :
+      APK_SIGNED_FILE_NAME;
+    this.prompt.printMessage(messages.messageApkSuccess(apkFileName));
 
     await this.buildAppBundle();
-    await this.signAppBundle(twaManifest.signingKey, passwords);
-    this.prompt.printMessage(messages.messageAppBundleSuccess(APP_BUNDLE_SIGNED_FILE_NAME));
+    if (passwords) {
+      await this.signAppBundle(twaManifest.signingKey, passwords);
+    }
+    const appBundleFileName = this.args.skipSigning ?
+      APP_BUNDLE_BUILD_OUTPUT_FILE_NAME :
+      APP_BUNDLE_SIGNED_FILE_NAME;
+    this.prompt.printMessage(messages.messageAppBundleSuccess(appBundleFileName));
 
-    await this.generateAssetLinks(twaManifest, passwords);
+    if (passwords) {
+      await this.generateAssetLinks(twaManifest, passwords);
+    }
 
     if (validationPromise !== null) {
       const result = await validationPromise;

diff --git a/packages/cli/src/lib/cmds/help.ts b/packages/cli/src/lib/cmds/help.ts
@@ -60,6 +60,7 @@ const HELP_MESSAGES = new Map<string, string>(
         '',
         'Options:',
         '--skipPwaValidation ....... skips validating the wrapped PWA against the Quality Criteria',
+        '--skipSigning ............. skips signing the built APK and App Bundle',
         '--manifest ................ directory where the client should look for twa-manifest.json',
       ].join('\n')],
       ['update', [

diff --git a/packages/cli/src/lib/strings.ts b/packages/cli/src/lib/strings.ts
@@ -35,7 +35,7 @@ type Messages = {
   messageInitializingWebManifest: (manifestUrl: string) => string;
   messageAndroidAppDetails: string;
   messageAndroidAppDetailsDesc: string;
-  messageApkSucess: (filename: string) => string;
+  messageApkSuccess: (filename: string) => string;
   messageAppBundleSuccess: (filename: string) => string;
   messageBuildingApp: string;
   messageDigitalAssetLinksSuccess: (filename: string) => string;
@@ -165,7 +165,7 @@ into a device:
 
 \t- ${bold('Status bar color:')} sets the status bar color used when the
 \t  application is in foreground. Example: ${cyan('#7CC0FF')}\n`,
-  messageApkSucess: (filename: string): string => {
+  messageApkSuccess: (filename: string): string => {
     return `\t- Generated Android APK at ${cyan(filename)}`;
   },
   messageAppBundleSuccess: (filename: string): string => {