From 29ff79942b2c55a0e97e2c2f08c7433b2a35d1fd Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Wed, 10 Mar 2021 11:53:14 -0500
Subject: [PATCH 1/3] chore: Bump cli verstion to 0.1.8

---
 ui/desktop/electron-app/config/cli.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/desktop/electron-app/config/cli.js b/ui/desktop/electron-app/config/cli.js
index b3a24e434..1badbfbcc 100644
--- a/ui/desktop/electron-app/config/cli.js
+++ b/ui/desktop/electron-app/config/cli.js
@@ -4,7 +4,7 @@ const https = require('https');
 const decompress = require('decompress');
 const os = require('os');
 
-const artifactVersion = '0.1.6';
+const artifactVersion = '0.1.8';
 const artifactDestination = path.resolve(__dirname, '..', 'cli');
 
 const downloadArtifact = version => {

From a81de6a996e70b0e98f3a000b4bf04f54d408734 Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Wed, 10 Mar 2021 13:30:34 -0500
Subject: [PATCH 2/3] chore: add env var output during desktop build of
 RELEASE_VERSION and COMMIT

---
 ui/desktop/electron-app/config/forge.config.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ui/desktop/electron-app/config/forge.config.js b/ui/desktop/electron-app/config/forge.config.js
index 032e93283..2059af2f3 100644
--- a/ui/desktop/electron-app/config/forge.config.js
+++ b/ui/desktop/electron-app/config/forge.config.js
@@ -12,6 +12,11 @@ const appCommit = process.env.COMMIT
 
 const formattedAppVersion = `${appVersion}${appCommit}`;
 
+// Output version strings for debugging
+console.log('\n\nVersion Env Vars:');
+console.log('RELEASE_VERSION     ', process.env.RELEASE_VERSION);
+console.log('COMMIT              ', process.env.COMMIT);
+
 module.exports = {
   hooks: {
     prePackage: () => {

From 8f8e2575230570c37e4c976fedbaab2bd636ccc8 Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Wed, 10 Mar 2021 14:56:00 -0500
Subject: [PATCH 3/3] chore: Rename COMMIT var to RELEASE_COMMIT to match
 CircleCi

---
 ui/desktop/electron-app/config/forge.config.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/desktop/electron-app/config/forge.config.js b/ui/desktop/electron-app/config/forge.config.js
index 2059af2f3..4151023de 100644
--- a/ui/desktop/electron-app/config/forge.config.js
+++ b/ui/desktop/electron-app/config/forge.config.js
@@ -6,8 +6,8 @@ const formattedCLIVersion = version().formatted;
 const appVersion = process.env.RELEASE_VERSION
   ? `Version:  ${process.env.RELEASE_VERSION}\n`
   : '';
-const appCommit = process.env.COMMIT
-  ? `Commit:  ${process.env.COMMIT}\n`
+const appCommit = process.env.RELEASE_COMMIT
+  ? `Commit:  ${process.env.RELEASE_COMMIT}\n`
   : '';
 
 const formattedAppVersion = `${appVersion}${appCommit}`;
@@ -15,7 +15,7 @@ const formattedAppVersion = `${appVersion}${appCommit}`;
 // Output version strings for debugging
 console.log('\n\nVersion Env Vars:');
 console.log('RELEASE_VERSION     ', process.env.RELEASE_VERSION);
-console.log('COMMIT              ', process.env.COMMIT);
+console.log('RELEASE_COMMIT      ', process.env.RELEASE_COMMIT);
 
 module.exports = {
   hooks: {