From 8dc30dd04753eabca32081516fce863a07fd16b8 Mon Sep 17 00:00:00 2001 From: Nguyen Ngoc Minh <91668012+Minh141120@users.noreply.github.com> Date: Wed, 5 Mar 2025 20:30:57 +0700 Subject: [PATCH] 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 | 3 ++ .../workflows/jan-electron-build-nightly.yml | 3 ++ .../workflows/template-build-linux-x64.yml | 38 ++++++++++++++++++- .github/workflows/template-build-macos.yml | 14 ++++++- .../workflows/template-build-windows-x64.yml | 14 ++++++- 5 files changed, 66 insertions(+), 6 deletions(-) diff --git a/.github/workflows/jan-electron-build-beta.yml b/.github/workflows/jan-electron-build-beta.yml index c8b2f4b2f..61ff717ac 100644 --- a/.github/workflows/jan-electron-build-beta.yml +++ b/.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: diff --git a/.github/workflows/jan-electron-build-nightly.yml b/.github/workflows/jan-electron-build-nightly.yml index 6f1b8d901..af5bab195 100644 --- a/.github/workflows/jan-electron-build-nightly.yml +++ b/.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: diff --git a/.github/workflows/template-build-linux-x64.yml b/.github/workflows/template-build-linux-x64.yml index 5ab492f34..e2fcc80dd 100644 --- a/.github/workflows/template-build-linux-x64.yml +++ b/.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 diff --git a/.github/workflows/template-build-macos.yml b/.github/workflows/template-build-macos.yml index 9a9a79efb..338871836 100644 --- a/.github/workflows/template-build-macos.yml +++ b/.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 diff --git a/.github/workflows/template-build-windows-x64.yml b/.github/workflows/template-build-windows-x64.yml index 2833dd578..2d5f28cb9 100644 --- a/.github/workflows/template-build-windows-x64.yml +++ b/.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