Merge pull request #2589 from ever-co/develop

chore: desktop apps build fixes
ever-co · Jun 9, 2024 · 2099650 · 2099650
2 parents 6580516 + 6946448
commit 2099650
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 6 deletions.
diff --git a/.github/workflows/server-api.apps.yml → ...hub/workflows/desktop-server-api.apps.yml b/.github/workflows/server-api.apps.yml → ...hub/workflows/desktop-server-api.apps.yml
@@ -58,7 +58,7 @@ jobs:
         with:
           script: |
             const script = require('./.scripts/bump-version-electron.js')
-            script.serverapi(true).then(console.log)
+            console.log(script.serverapi(true))
         env:
           PROJECT_REPO: 'https://github.com/ever-co/ever-teams.git'
           DESKTOP_API_SERVER_APP_NAME: 'ever-teams-api-server'
@@ -136,7 +136,7 @@ jobs:
         with:
           script: |
             const script = require('./.scripts/bump-version-electron.js')
-            script.serverapi(true).then(console.log)
+            console.log(script.serverapi(true))
         env:
           PROJECT_REPO: 'https://github.com/ever-co/ever-teams.git'
           DESKTOP_API_SERVER_APP_NAME: 'ever-teams-api-server'
@@ -214,7 +214,7 @@ jobs:
         with:
           script: |
             const script = require('./.scripts/bump-version-electron.js')
-            script.serverapi(true).then(console.log)
+            console.log(script.serverapi(true))
         env:
           PROJECT_REPO: 'https://github.com/ever-co/ever-teams.git'
           DESKTOP_API_SERVER_APP_NAME: 'ever-teams-api-server'
@@ -251,3 +251,21 @@ jobs:
           I18N_FILES_URL: 'https://raw.githubusercontent.com/ever-co/ever-teams/develop/apps/server-api/i18n'
           PLATFORM_LOGO: 'https://app.ever.team/assets/ever-teams.png'
           GAUZY_DESKTOP_LOGO_512X512: 'https://raw.githubusercontent.com/ever-co/ever-gauzy/develop/apps/desktop-timer/src/assets/icons/icon_512x512.png'
+          # Override unwanted environment variables
+          STATS_D: ''
+          STATS_D_D: ''
+          STATS_EXT: ''
+          STATS_EXTP: ''
+          STATS_RDCL: ''
+          STATS_TIS: ''
+          STATS_TRP: ''
+          STATS_UE: ''
+          STATS_V3PS: ''
+          STATS_VMD: ''
+          STATS_VMFE: ''
+          ANDROID_HOME: ''
+          ANDROID_NDK: ''
+          ANDROID_NDK_HOME: ''
+          ANDROID_NDK_LATEST_HOME: ''
+          ANDROID_NDK_ROOT: ''
+          ANDROID_SDK_ROOT: ''
diff --git a/.github/workflows/desktop.apps.yml b/.github/workflows/desktop.apps.yml
@@ -58,7 +58,7 @@ jobs:
         with:
           script: |
             const script = require('./.scripts/bump-version-electron.js')
-            script.desktopTimer(true).then(console.log)
+            console.log(script.desktopTimer(true))
         env:
           PROJECT_REPO: 'https://github.com/ever-co/ever-teams.git'
           DESKTOP_TIMER_APP_NAME: 'ever-teams-desktop'
@@ -136,7 +136,7 @@ jobs:
         with:
           script: |
             const script = require('./.scripts/bump-version-electron.js')
-            script.desktopTimer(true).then(console.log)
+            console.log(script.desktopTimer(true))
         env:
           PROJECT_REPO: 'https://github.com/ever-co/ever-teams.git'
           DESKTOP_TIMER_APP_NAME: 'ever-teams-desktop'
@@ -214,7 +214,7 @@ jobs:
         with:
           script: |
             const script = require('./.scripts/bump-version-electron.js')
-            script.desktopTimer(true).then(console.log)
+            console.log(script.desktopTimer(true))
         env:
           PROJECT_REPO: 'https://github.com/ever-co/ever-teams.git'
           DESKTOP_TIMER_APP_NAME: 'ever-teams-desktop'
@@ -251,3 +251,21 @@ jobs:
           I18N_FILES_URL: 'https://raw.githubusercontent.com/ever-co/ever-teams/develop/apps/desktop/i18n'
           PLATFORM_LOGO: 'https://app.ever.team/assets/ever-teams.png'
           GAUZY_DESKTOP_LOGO_512X512: 'https://raw.githubusercontent.com/ever-co/ever-gauzy/develop/apps/desktop-timer/src/assets/icons/icon_512x512.png'
+          # Override unwanted environment variables
+          STATS_D: ''
+          STATS_D_D: ''
+          STATS_EXT: ''
+          STATS_EXTP: ''
+          STATS_RDCL: ''
+          STATS_TIS: ''
+          STATS_TRP: ''
+          STATS_UE: ''
+          STATS_V3PS: ''
+          STATS_VMD: ''
+          STATS_VMFE: ''
+          ANDROID_HOME: ''
+          ANDROID_NDK: ''
+          ANDROID_NDK_HOME: ''
+          ANDROID_NDK_LATEST_HOME: ''
+          ANDROID_NDK_ROOT: ''
+          ANDROID_SDK_ROOT: ''