From 01096a225b0f82409df8c28df83fee9bf4faccdf Mon Sep 17 00:00:00 2001
From: im-adithya <imadithyavardhan@gmail.com>
Date: Thu, 26 Sep 2024 11:52:49 +0530
Subject: [PATCH] chore: add tag to artifacts

---
 .github/workflows/create-release.yaml |  6 +++---
 .github/workflows/http.yml            |  5 +++--
 .github/workflows/wails.yml           | 21 ++++++++++++++++++---
 build/darwin/gon-notarize.json        |  8 --------
 wails.json                            |  6 +++---
 5 files changed, 27 insertions(+), 19 deletions(-)
 delete mode 100644 build/darwin/gon-notarize.json

diff --git a/.github/workflows/create-release.yaml b/.github/workflows/create-release.yaml
index 77e36856..8bb8ff40 100644
--- a/.github/workflows/create-release.yaml
+++ b/.github/workflows/create-release.yaml
@@ -10,17 +10,17 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - name: Download Linux server archives
+      - name: Download server archives
         uses: actions/download-artifact@v4
         with:
-          pattern: albyhub-Server-*
+          pattern: AlbyHub-Server-*
           path: artifacts
           merge-multiple: true
 
       - name: Download desktop archives
         uses: actions/download-artifact@v4
         with:
-          pattern: albyhub-Desktop-*
+          pattern: AlbyHub-Desktop-*
           path: artifacts
           merge-multiple: true
 
diff --git a/.github/workflows/http.yml b/.github/workflows/http.yml
index 3ad2fc1a..5a559334 100644
--- a/.github/workflows/http.yml
+++ b/.github/workflows/http.yml
@@ -53,11 +53,12 @@ jobs:
     steps:
       - name: Setup
         run: |
+          SANITIZED_TAG="${{ github.ref_name//./- }}"
           echo "EXEC_NAME=albyhub" >> $GITHUB_ENV
           if [ "${{ runner.os }}" == "macOS" ]; then
-            echo "PACKAGE_NAME=albyhub-Server-MacOS" >> $GITHUB_ENV
+            echo "PACKAGE_NAME=AlbyHub-Server-MacOS-${SANITIZED_TAG}" >> $GITHUB_ENV
           else
-            echo "PACKAGE_NAME=albyhub-Server-Linux-${{ matrix.build.arch }}" >> $GITHUB_ENV
+            echo "PACKAGE_NAME=AlbyHub-Server-Linux-${{ matrix.build.arch }}-${SANITIZED_TAG}" >> $GITHUB_ENV
           fi
 
       - uses: actions/checkout@v4
diff --git a/.github/workflows/wails.yml b/.github/workflows/wails.yml
index d4f91c83..f2c132af 100644
--- a/.github/workflows/wails.yml
+++ b/.github/workflows/wails.yml
@@ -42,8 +42,9 @@ jobs:
       - name: Setup
         shell: bash
         run: |
-          echo "EXEC_NAME=albyhub" >> $GITHUB_ENV
-          echo "PACKAGE_NAME=albyhub-Desktop-${{ runner.os }}" >> $GITHUB_ENV
+          SANITIZED_TAG="${{ github.ref_name//./- }}"
+          echo "EXEC_NAME=AlbyHub" >> $GITHUB_ENV
+          echo "PACKAGE_NAME=AlbyHub-Desktop-${{ runner.os }}-${SANITIZED_TAG}" >> $GITHUB_ENV
 
       - uses: actions/checkout@v4
         with:
@@ -203,8 +204,22 @@ jobs:
           rm -Rf ./build/bin/*
           mv ./build/out/${{ env.PACKAGE_NAME }}.dmg ./build/bin/
 
+      - name: Generate gon-notarize.json
+        if: runner.os == 'macOS'
+        run: |
+          cat > ./build/darwin/gon-notarize.json << EOF
+          {
+            "notarize": [
+              {
+                "path": "./build/bin/${PACKAGE_NAME}.dmg",
+                "bundle_id": "com.getalby.AlbyHub"
+              }
+            ]
+          }
+          EOF
+
       - name: Notarize the DMG image
-        if: runner.os == 'macOS' && inputs.build-release
+        if: runner.os == 'macOS' # TODO: && inputs.build-release
         run: |
           echo "Notarizing Zip Files"
           gon -log-level=info -log-json ./build/darwin/gon-notarize.json
diff --git a/build/darwin/gon-notarize.json b/build/darwin/gon-notarize.json
deleted file mode 100644
index c0c34c02..00000000
--- a/build/darwin/gon-notarize.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "notarize": [
-    {
-      "path": "./build/bin/albyhub-Desktop-macOS.dmg",
-      "bundle_id": "com.getalby.AlbyHub"
-    }
-  ]
-}
diff --git a/wails.json b/wails.json
index 5acf2f9b..e8b11543 100644
--- a/wails.json
+++ b/wails.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://wails.io/schemas/config.v2.json",
-  "name": "Alby Hub",
-  "outputfilename": "albyhub",
+  "name": "AlbyHub",
+  "outputfilename": "AlbyHub",
   "frontend:install": "yarn install",
   "frontend:build": "yarn build:wails",
   "frontend:dev:watcher": "yarn dev:wails",
@@ -11,7 +11,7 @@
     "email": "hello@getalby.com"
   },
   "info": {
-    "companyName": "Alby",
+    "companyName": "Alby Inc.",
     "productName": "Alby Hub"
   }
 }