diff --git a/ui/desktop/electron-app/config/forge.config.js b/ui/desktop/electron-app/config/forge.config.js index 612c4d733..aab636b03 100644 --- a/ui/desktop/electron-app/config/forge.config.js +++ b/ui/desktop/electron-app/config/forge.config.js @@ -3,6 +3,15 @@ const { version } = require('../src/boundary-cli.js'); const formattedCLIVersion = version().formatted; +const appVersion = process.env.VERSION + ? `Version: ${process.env.VERSION}\n` + : ''; +const appCommit = process.env.COMMIT + ? `Commit: ${process.env.COMMIT}\n` + : ''; + +const formattedAppVersion = `${appVersion}${appCommit}`; + module.exports = { hooks: { prePackage: () => { @@ -19,7 +28,7 @@ module.exports = { name: "Boundary Desktop", appBundleId: "com.electron.boundary", // TODO: where should the client version number come from? - appVersion: `1.0.0 ${formattedCLIVersion}`, + appVersion: `${formattedAppVersion}${formattedCLIVersion}\n`, appCopyright: "Copyright © 2021 HashiCorp, Inc.", icon: "./config/macos/icon.icns", osxSign: { diff --git a/ui/desktop/electron-app/src/boundary-cli.js b/ui/desktop/electron-app/src/boundary-cli.js index 241f288fc..2227687ed 100644 --- a/ui/desktop/electron-app/src/boundary-cli.js +++ b/ui/desktop/electron-app/src/boundary-cli.js @@ -49,8 +49,8 @@ module.exports = { if (gitRevision) gitRevision = gitRevision.groups.rev; if (versionNumber) versionNumber = versionNumber.groups.ver; const formatted = versionNumber - ? `CLI Version ${versionNumber}; CLI Git Rev ${gitRevision}` - : `CLI Git Rev ${gitRevision}`; + ? `CLI Version: ${versionNumber}\nCLI Commit: ${gitRevision}` + : `CLI Commit: ${gitRevision}`; return { gitRevision, versionNumber, formatted }; return rawOutput; }