Update upload-bundle action

canonical · Aug 27, 2024 · 27483d0 · 27483d0
1 parent 0f04d2b
commit 27483d0
Show file tree

Hide file tree

Showing 8 changed files with 123 additions and 89 deletions.
diff --git a/dist/channel/index.js b/dist/channel/index.js
@@ -42646,19 +42646,23 @@ class Bundle {
             core.exportVariable('CHARMCRAFT_AUTH', core.getInput('credentials'));
             process.chdir(path);
             const result = yield exec.getExecOutput('charmcraft', ['pack']);
-            core.info(result.stdout);
-            const lastLine = result.stderr.trim().split('\n').pop();
-            if (lastLine) {
-                const bundleName = lastLine.split(' ')[1];
-                yield exec.exec('charmcraft', [
-                    'upload',
-                    bundleName,
-                    '--release',
-                    channel,
-                ]);
+            if (result.exitCode === 0) {
+                const lastLine = result.stderr.trim().split('\n').pop();
+                if (lastLine) {
+                    const bundleName = lastLine.split(' ')[1];
+                    yield exec.exec('charmcraft', [
+                        'upload',
+                        bundleName,
+                        '--release',
+                        channel,
+                    ]);
+                }
+                else {
+                    throw new Error('Failed to extract the bundle name from the output of charmcraft pack.');
+                }
             }
             else {
-                throw new Error('charmcraft pack ran unsuccessfully');
+                throw new Error(`charmcraft pack ran unsuccessfully with exit code ${result.exitCode}.`);
             }
         });
     }

diff --git a/dist/check-libraries/index.js b/dist/check-libraries/index.js
@@ -42841,19 +42841,23 @@ class Bundle {
             core.exportVariable('CHARMCRAFT_AUTH', core.getInput('credentials'));
             process.chdir(path);
             const result = yield exec.getExecOutput('charmcraft', ['pack']);
-            core.info(result.stdout);
-            const lastLine = result.stderr.trim().split('\n').pop();
-            if (lastLine) {
-                const bundleName = lastLine.split(' ')[1];
-                yield exec.exec('charmcraft', [
-                    'upload',
-                    bundleName,
-                    '--release',
-                    channel,
-                ]);
+            if (result.exitCode === 0) {
+                const lastLine = result.stderr.trim().split('\n').pop();
+                if (lastLine) {
+                    const bundleName = lastLine.split(' ')[1];
+                    yield exec.exec('charmcraft', [
+                        'upload',
+                        bundleName,
+                        '--release',
+                        channel,
+                    ]);
+                }
+                else {
+                    throw new Error('Failed to extract the bundle name from the output of charmcraft pack.');
+                }
             }
             else {
-                throw new Error('charmcraft pack ran unsuccessfully');
+                throw new Error(`charmcraft pack ran unsuccessfully with exit code ${result.exitCode}.`);
             }
         });
     }

diff --git a/dist/promote-charm/index.js b/dist/promote-charm/index.js
@@ -42725,19 +42725,23 @@ class Bundle {
             core.exportVariable('CHARMCRAFT_AUTH', core.getInput('credentials'));
             process.chdir(path);
             const result = yield exec.getExecOutput('charmcraft', ['pack']);
-            core.info(result.stdout);
-            const lastLine = result.stderr.trim().split('\n').pop();
-            if (lastLine) {
-                const bundleName = lastLine.split(' ')[1];
-                yield exec.exec('charmcraft', [
-                    'upload',
-                    bundleName,
-                    '--release',
-                    channel,
-                ]);
+            if (result.exitCode === 0) {
+                const lastLine = result.stderr.trim().split('\n').pop();
+                if (lastLine) {
+                    const bundleName = lastLine.split(' ')[1];
+                    yield exec.exec('charmcraft', [
+                        'upload',
+                        bundleName,
+                        '--release',
+                        channel,
+                    ]);
+                }
+                else {
+                    throw new Error('Failed to extract the bundle name from the output of charmcraft pack.');
+                }
             }
             else {
-                throw new Error('charmcraft pack ran unsuccessfully');
+                throw new Error(`charmcraft pack ran unsuccessfully with exit code ${result.exitCode}.`);
             }
         });
     }

diff --git a/dist/release-charm/index.js b/dist/release-charm/index.js
@@ -42737,19 +42737,23 @@ class Bundle {
             core.exportVariable('CHARMCRAFT_AUTH', core.getInput('credentials'));
             process.chdir(path);
             const result = yield exec.getExecOutput('charmcraft', ['pack']);
-            core.info(result.stdout);
-            const lastLine = result.stderr.trim().split('\n').pop();
-            if (lastLine) {
-                const bundleName = lastLine.split(' ')[1];
-                yield exec.exec('charmcraft', [
-                    'upload',
-                    bundleName,
-                    '--release',
-                    channel,
-                ]);
+            if (result.exitCode === 0) {
+                const lastLine = result.stderr.trim().split('\n').pop();
+                if (lastLine) {
+                    const bundleName = lastLine.split(' ')[1];
+                    yield exec.exec('charmcraft', [
+                        'upload',
+                        bundleName,
+                        '--release',
+                        channel,
+                    ]);
+                }
+                else {
+                    throw new Error('Failed to extract the bundle name from the output of charmcraft pack.');
+                }
             }
             else {
-                throw new Error('charmcraft pack ran unsuccessfully');
+                throw new Error(`charmcraft pack ran unsuccessfully with exit code ${result.exitCode}.`);
             }
         });
     }

diff --git a/dist/release-libraries/index.js b/dist/release-libraries/index.js
@@ -42868,19 +42868,23 @@ class Bundle {
             core.exportVariable('CHARMCRAFT_AUTH', core.getInput('credentials'));
             process.chdir(path);
             const result = yield exec.getExecOutput('charmcraft', ['pack']);
-            core.info(result.stdout);
-            const lastLine = result.stderr.trim().split('\n').pop();
-            if (lastLine) {
-                const bundleName = lastLine.split(' ')[1];
-                yield exec.exec('charmcraft', [
-                    'upload',
-                    bundleName,
-                    '--release',
-                    channel,
-                ]);
+            if (result.exitCode === 0) {
+                const lastLine = result.stderr.trim().split('\n').pop();
+                if (lastLine) {
+                    const bundleName = lastLine.split(' ')[1];
+                    yield exec.exec('charmcraft', [
+                        'upload',
+                        bundleName,
+                        '--release',
+                        channel,
+                    ]);
+                }
+                else {
+                    throw new Error('Failed to extract the bundle name from the output of charmcraft pack.');
+                }
             }
             else {
-                throw new Error('charmcraft pack ran unsuccessfully');
+                throw new Error(`charmcraft pack ran unsuccessfully with exit code ${result.exitCode}.`);
             }
         });
     }

diff --git a/dist/upload-bundle/index.js b/dist/upload-bundle/index.js
@@ -42716,19 +42716,23 @@ class Bundle {
             core.exportVariable('CHARMCRAFT_AUTH', core.getInput('credentials'));
             process.chdir(path);
             const result = yield exec.getExecOutput('charmcraft', ['pack']);
-            core.info(result.stdout);
-            const lastLine = result.stderr.trim().split('\n').pop();
-            if (lastLine) {
-                const bundleName = lastLine.split(' ')[1];
-                yield exec.exec('charmcraft', [
-                    'upload',
-                    bundleName,
-                    '--release',
-                    channel,
-                ]);
+            if (result.exitCode === 0) {
+                const lastLine = result.stderr.trim().split('\n').pop();
+                if (lastLine) {
+                    const bundleName = lastLine.split(' ')[1];
+                    yield exec.exec('charmcraft', [
+                        'upload',
+                        bundleName,
+                        '--release',
+                        channel,
+                    ]);
+                }
+                else {
+                    throw new Error('Failed to extract the bundle name from the output of charmcraft pack.');
+                }
             }
             else {
-                throw new Error('charmcraft pack ran unsuccessfully');
+                throw new Error(`charmcraft pack ran unsuccessfully with exit code ${result.exitCode}.`);
             }
         });
     }

diff --git a/dist/upload-charm/index.js b/dist/upload-charm/index.js
@@ -42756,19 +42756,23 @@ class Bundle {
             core.exportVariable('CHARMCRAFT_AUTH', core.getInput('credentials'));
             process.chdir(path);
             const result = yield exec.getExecOutput('charmcraft', ['pack']);
-            core.info(result.stdout);
-            const lastLine = result.stderr.trim().split('\n').pop();
-            if (lastLine) {
-                const bundleName = lastLine.split(' ')[1];
-                yield exec.exec('charmcraft', [
-                    'upload',
-                    bundleName,
-                    '--release',
-                    channel,
-                ]);
+            if (result.exitCode === 0) {
+                const lastLine = result.stderr.trim().split('\n').pop();
+                if (lastLine) {
+                    const bundleName = lastLine.split(' ')[1];
+                    yield exec.exec('charmcraft', [
+                        'upload',
+                        bundleName,
+                        '--release',
+                        channel,
+                    ]);
+                }
+                else {
+                    throw new Error('Failed to extract the bundle name from the output of charmcraft pack.');
+                }
             }
             else {
-                throw new Error('charmcraft pack ran unsuccessfully');
+                throw new Error(`charmcraft pack ran unsuccessfully with exit code ${result.exitCode}.`);
             }
         });
     }

diff --git a/src/services/bundle/bundle.ts b/src/services/bundle/bundle.ts
@@ -7,19 +7,25 @@ class Bundle {
     process.chdir(path);
 
     const result = await exec.getExecOutput('charmcraft', ['pack']);
-    core.info(result.stdout);
-    const lastLine = result.stderr.trim().split('\n').pop();
-
-    if (lastLine) {
-      const bundleName = lastLine.split(' ')[1];
-      await exec.exec('charmcraft', [
-        'upload',
-        bundleName,
-        '--release',
-        channel,
-      ]);
+    if (result.exitCode === 0) {
+      const lastLine = result.stderr.trim().split('\n').pop();
+      if (lastLine) {
+        const bundleName = lastLine.split(' ')[1];
+        await exec.exec('charmcraft', [
+          'upload',
+          bundleName,
+          '--release',
+          channel,
+        ]);
+      } else {
+        throw new Error(
+          'Failed to extract the bundle name from the output of charmcraft pack.',
+        );
+      }
     } else {
-      throw new Error('charmcraft pack ran unsuccessfully');
+      throw new Error(
+        `charmcraft pack ran unsuccessfully with exit code ${result.exitCode}.`,
+      );
     }
   }
 }