fix: prevent race conditions on build (#2036)

* fix: prevent race conditions on build

* refactor: upload artifacts and keep for 1 day

* chore: remove deprecated settings

* Revert "refactor: icon compatibility with macos tahoe"

This reverts commit a7a78702b1.

.github/workflows/build_electron.yml

@@ -44,6 +44,16 @@ jobs:
         run: pnpm dist-mac --env-mode=loose
         timeout-minutes: 60
 
+      - name: Upload macOS build artifacts
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: ontime-macos-build
+          path: |
+            ./apps/electron/dist/ontime-macOS-x64.dmg
+            ./apps/electron/dist/ontime-macOS-arm64.dmg
+          retention-days: 1
+
       - name: Release
         uses: softprops/action-gh-release@v1
         with:
@@ -73,6 +83,16 @@ jobs:
       - name: Electron - Build app
         run: pnpm dist-win
 
+      - name: Upload Windows build artifacts
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: ontime-windows-build
+          path: |
+            ./apps/electron/dist/ontime-win64.exe
+            ./apps/electron/dist/win-unpacked/
+          retention-days: 1
+
       - name: Release
         uses: softprops/action-gh-release@v1
         with:
@@ -100,6 +120,17 @@ jobs:
       - name: Electron - Build app
         run: pnpm dist-linux
 
+      - name: Upload Linux build artifacts
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: ontime-linux-build
+          path: |
+            ./apps/electron/dist/ontime-linux-x86_64.AppImage
+            ./apps/electron/dist/ontime-linux-arm64.AppImage
+            ./apps/electron/dist/ontime-linux-armv7l.AppImage
+          retention-days: 1
+
       - name: Release
         uses: softprops/action-gh-release@v1
         with:

apps/client/vite.config.js

@@ -105,9 +105,6 @@ export default defineConfig({
       '@': path.resolve(__dirname, './src'),
     },
   },
-  esbuild: {
-    legalComments: 'none',
-  },
   css: {
     preprocessorOptions: {
       scss: {

apps/electron/package.json

@@ -14,7 +14,7 @@
   "main": "src/main.js",
   "devDependencies": {
     "electron": "38.2.1",
-    "electron-builder": "26.8.1",
+    "electron-builder": "26.0.18",
     "wait-on": "^7.2.0"
   },
   "scripts": {
@@ -29,7 +29,8 @@
     "appId": "no.lightdev.ontime",
     "asar": true,
     "dmg": {
-      "artifactName": "ontime-macOS-${arch}.dmg"
+      "artifactName": "ontime-macOS-${arch}.dmg",
+      "icon": "icon.icns"
     },
     "mac": {
       "notarize": true,
@@ -45,7 +46,7 @@
         ]
       },
       "category": "public.app-category.productivity",
-      "icon": "ontime.icon"
+      "icon": "icon.icns"
     },
     "win": {
       "target": "nsis"

apps/electron/src/assets/ontime.icon/icon.json

@@ -1,62 +0,0 @@
-{
-  "fill-specializations" : [
-    {
-      "value" : "system-dark"
-    },
-    {
-      "appearance" : "dark",
-      "value" : "system-dark"
-    }
-  ],
-  "groups" : [
-    {
-      "layers" : [
-        {
-          "blend-mode-specializations" : [
-            {
-              "appearance" : "dark",
-              "value" : "normal"
-            }
-          ],
-          "glass-specializations" : [
-            {
-              "value" : false
-            },
-            {
-              "appearance" : "dark",
-              "value" : false
-            },
-            {
-              "appearance" : "tinted",
-              "value" : false
-            }
-          ],
-          "hidden" : false,
-          "image-name" : "ontime-icon.png",
-          "name" : "ontime-icon",
-          "position" : {
-            "scale" : 1,
-            "translation-in-points" : [
-              -0.5,
-              -113
-            ]
-          }
-        }
-      ],
-      "shadow" : {
-        "kind" : "neutral",
-        "opacity" : 0.5
-      },
-      "translucency" : {
-        "enabled" : true,
-        "value" : 0.5
-      }
-    }
-  ],
-  "supported-platforms" : {
-    "circles" : [
-      "watchOS"
-    ],
-    "squares" : "shared"
-  }
-}

turbo.json

@@ -40,15 +40,15 @@
     },
 
     "dist-win": {
-      "dependsOn": ["build"],
+      "dependsOn": ["build", "ontime-ui#build", "ontime-server#build"],
       "outputs": ["dist/**"]
     },
     "dist-mac": {
-      "dependsOn": ["build"],
+      "dependsOn": ["build", "ontime-ui#build", "ontime-server#build"],
       "outputs": ["dist/**"]
     },
     "dist-linux": {
-      "dependsOn": ["build"],
+      "dependsOn": ["build", "ontime-ui#build", "ontime-server#build"],
       "outputs": ["dist/**"]
     }
   }