fix: naming nightly and beta build (#4779)

* fix: naming nightly and beta build

* chore: enhance replace icons for beta and nightly build logic

* chore: update icon linux build

* chore: add debug step

* chore: remove specific icon linux build

.github/workflows/jan-electron-build-beta.yml

@@ -18,6 +18,7 @@ jobs:
       public_provider: github
       new_version: ${{ needs.get-update-version.outputs.new_version }}
       beta: true
+      nightly: false
       cortex_api_port: "39271"
 
   build-windows-x64:
@@ -29,6 +30,7 @@ jobs:
       public_provider: github
       new_version: ${{ needs.get-update-version.outputs.new_version }}
       beta: true
+      nightly: false
       cortex_api_port: "39271"
 
   build-linux-x64:
@@ -40,6 +42,7 @@ jobs:
       public_provider: github
       new_version: ${{ needs.get-update-version.outputs.new_version }}
       beta: true
+      nightly: false
       cortex_api_port: "39271"
 
   sync-temp-to-latest:

.github/workflows/jan-electron-build-nightly.yml

@@ -56,6 +56,7 @@ jobs:
       public_provider: ${{ needs.set-public-provider.outputs.public_provider }}
       new_version: ${{ needs.get-update-version.outputs.new_version }}
       nightly: true
+      beta: false
       cortex_api_port: "39261"
 
   build-windows-x64:
@@ -67,6 +68,7 @@ jobs:
       public_provider: ${{ needs.set-public-provider.outputs.public_provider }}
       new_version: ${{ needs.get-update-version.outputs.new_version }}
       nightly: true
+      beta: false
       cortex_api_port: "39261"
   build-linux-x64:
     uses: ./.github/workflows/template-build-linux-x64.yml
@@ -77,6 +79,7 @@ jobs:
       public_provider: ${{ needs.set-public-provider.outputs.public_provider }}
       new_version: ${{ needs.get-update-version.outputs.new_version }}
       nightly: true
+      beta: false
       cortex_api_port: "39261"
 
   sync-temp-to-latest:

.github/workflows/template-build-linux-x64.yml

@@ -52,24 +52,58 @@ jobs:
           ref: ${{ inputs.ref }}
 
       - name: Replace Icons for Beta Build
-        if: inputs.beta == true
+        if: inputs.beta == true && inputs.nightly != true
         shell: bash
         run: |
+          echo "Icons before replacement:"
+          ls -la electron/icons/
+          
+          echo "Setting up beta icons"
+          
+          # Replace the key icon files with move operations (no need for rm first)
           mv electron/icons/jan-beta-512x512.png electron/icons/512x512.png
           mv electron/icons/jan-beta.ico electron/icons/icon.ico
           mv electron/icons/jan-beta.png electron/icons/icon.png
           mv electron/icons/jan-beta-tray@2x.png electron/icons/icon-tray@2x.png
           mv electron/icons/jan-beta-tray.png electron/icons/icon-tray.png
+          
+          # Remove any remaining nightly icon files
+          rm -f electron/icons/jan-nightly-512x512.png
+          rm -f electron/icons/jan-nightly.ico
+          rm -f electron/icons/jan-nightly.png
+          rm -f electron/icons/jan-nightly-tray@2x.png
+          rm -f electron/icons/jan-nightly-tray.png
+          
+          # Verify the replacement
+          echo "Icons after replacement:"
+          ls -la electron/icons/
 
       - name: Replace Icons for Nightly Build
-        if: inputs.nightly == true
+        if: inputs.nightly == true && inputs.beta != true
         shell: bash
         run: |
+          echo "Icons before replacement:"
+          ls -la electron/icons/
+          
+          echo "Setting up nightly icons"
+          
+          # Replace the key icon files with move operations (no need for rm first)
           mv electron/icons/jan-nightly-512x512.png electron/icons/512x512.png
           mv electron/icons/jan-nightly.ico electron/icons/icon.ico
           mv electron/icons/jan-nightly.png electron/icons/icon.png
           mv electron/icons/jan-nightly-tray@2x.png electron/icons/icon-tray@2x.png
           mv electron/icons/jan-nightly-tray.png electron/icons/icon-tray.png
+          
+          # Remove any remaining beta icon files
+          rm -f electron/icons/jan-beta-512x512.png
+          rm -f electron/icons/jan-beta.ico
+          rm -f electron/icons/jan-beta.png
+          rm -f electron/icons/jan-beta-tray@2x.png
+          rm -f electron/icons/jan-beta-tray.png
+          
+          # Verify the replacement
+          echo "Icons after replacement:"
+          ls -la electron/icons/
 
       - name: Installing node
         uses: actions/setup-node@v1

.github/workflows/template-build-macos.yml

@@ -62,9 +62,14 @@ jobs:
           ref: ${{ inputs.ref }}
       
       - name: Replace Icons for Beta Build
-        if: inputs.beta == true
+        if: inputs.beta == true && inputs.nightly != true
         shell: bash
         run: |
+          rm -f electron/icons/512x512.png
+          rm -f electron/icons/icon.ico
+          rm -f electron/icons/icon.png
+          rm -f electron/icons/icon-tray@2x.png
+          rm -f electron/icons/icon-tray.png
           mv electron/icons/jan-beta-512x512.png electron/icons/512x512.png
           mv electron/icons/jan-beta.ico electron/icons/icon.ico
           mv electron/icons/jan-beta.png electron/icons/icon.png
@@ -72,9 +77,14 @@ jobs:
           mv electron/icons/jan-beta-tray.png electron/icons/icon-tray.png
 
       - name: Replace Icons for Nightly Build
-        if: inputs.nightly == true
+        if: inputs.nightly == true && inputs.beta != true
         shell: bash
         run: |
+          rm -f electron/icons/512x512.png
+          rm -f electron/icons/icon.ico
+          rm -f electron/icons/icon.png
+          rm -f electron/icons/icon-tray@2x.png
+          rm -f electron/icons/icon-tray.png
           mv electron/icons/jan-nightly-512x512.png electron/icons/512x512.png
           mv electron/icons/jan-nightly.ico electron/icons/icon.ico
           mv electron/icons/jan-nightly.png electron/icons/icon.png

.github/workflows/template-build-windows-x64.yml

@@ -61,9 +61,14 @@ jobs:
           ref: ${{ inputs.ref }}
 
       - name: Replace Icons for Beta Build
-        if: inputs.beta == true
+        if: inputs.beta == true && inputs.nightly != true
         shell: bash
         run: |
+          rm -f electron/icons/512x512.png
+          rm -f electron/icons/icon.ico
+          rm -f electron/icons/icon.png
+          rm -f electron/icons/icon-tray@2x.png
+          rm -f electron/icons/icon-tray.png
           mv electron/icons/jan-beta-512x512.png electron/icons/512x512.png
           mv electron/icons/jan-beta.ico electron/icons/icon.ico
           mv electron/icons/jan-beta.png electron/icons/icon.png
@@ -71,9 +76,14 @@ jobs:
           mv electron/icons/jan-beta-tray.png electron/icons/icon-tray.png
 
       - name: Replace Icons for Nightly Build
-        if: inputs.nightly == true
+        if: inputs.nightly == true && inputs.beta != true
         shell: bash
         run: |
+          rm -f electron/icons/512x512.png
+          rm -f electron/icons/icon.ico
+          rm -f electron/icons/icon.png
+          rm -f electron/icons/icon-tray@2x.png
+          rm -f electron/icons/icon-tray.png
           mv electron/icons/jan-nightly-512x512.png electron/icons/512x512.png
           mv electron/icons/jan-nightly.ico electron/icons/icon.ico
           mv electron/icons/jan-nightly.png electron/icons/icon.png