From 7d96d9125f2385253f3edba2be9806445cb8f5b6 Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Wed, 25 Aug 2021 14:17:29 -0400
Subject: [PATCH] fix: Update electron artifacts folder name

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

diff --git a/ui/desktop/electron-app/config/forge.config.js b/ui/desktop/electron-app/config/forge.config.js
index 6804ebd59..a1acbbe82 100644
--- a/ui/desktop/electron-app/config/forge.config.js
+++ b/ui/desktop/electron-app/config/forge.config.js
@@ -23,7 +23,7 @@ module.exports = {
     ignore: ['/ember-test(/|$)', '/tests(/|$)'],
     icon: './assets/app-icons/icon',
     name: config.productName,
-    appVersion: config.version,
+    appVersion: config.releaseVersion,
     appBundleId: 'com.electron.boundary',
     appCopyright: config.copyright,
     osxSign: {
@@ -68,17 +68,14 @@ module.exports = {
       }
     },
     postMake: (forgeConfig, options) => {
-      // Copy post make artifacts into flatter folder structure.
+      // Copy artifacts into release folder
       options.forEach(({ artifacts, platform, arch }) => {
         // Generate platform arch folder name
-        const destination = path.join(
-          'out',
-          'artifacts',
-          `${platform}-${arch}`
-        );
+        const folder = `boundary-desktop_${forgeConfig.packagerConfig.appVersion}_${platform}_${arch}`;
+        const destination = path.join('out', 'artifacts', folder);
         if (!fs.existsSync(destination))
           fs.mkdirSync(destination, { recursive: true });
-        // Copy artifacts into platform folder
+        // Copy artifacts
         artifacts.forEach(async (artifact) => {
           const artifactDestination = path.join(
             destination,