Update build

Author: lucemans

.github/workflows/build.yaml

@@ -1,7 +1,7 @@
 on:
-  push:
-    branches:
-      - master
+    push:
+        branches:
+            - master
 
 env:
     REGISTRY: ghcr.io
@@ -13,6 +13,44 @@ env:
     COMPOSE_DOCKER_CLI_BUILD: 1
 
 jobs:
+    build-web:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+
+            # Setup Node & PNPM
+            - name: Setup PNPM
+              uses: pnpm/action-setup@v4
+              with:
+                  run_install: false
+                  standalone: true
+                  package_json_file: web/package.json
+                  version: 8
+
+            - name: Setup Node
+              uses: actions/setup-node@main
+              with:
+                  node-version: 21
+                  cache: pnpm
+                  cache-dependency-path: "web"
+
+            - name: Install dependencies
+              working-directory: web
+              run: pnpm install
+
+            - name: Build web
+              working-directory: web
+              run: pnpm build
+
+            - name: Upload web artifacts
+              uses: actions/upload-artifact@v4
+              with:
+                  name: www
+                  path: web/dist
+                  retention-days: 1
+                  compression-level: 9
+
     build-engine:
         strategy:
             matrix:
@@ -40,34 +78,10 @@ jobs:
                   workspaces: engine
                   key: ${{ matrix.platform.arch }}
 
-            # Setup Node & PNPM
-            - name: Setup PNPM
-              uses: pnpm/action-setup@v4
-              with:
-                run_install: false
-                standalone: true
-                package_json_file: web/package.json
-                version: 8
-      
-            - name: Setup Node
-              uses: actions/setup-node@main
-              with:
-                node-version: 21
-                cache: pnpm
-                cache-dependency-path: 'web'
-
             # Install cross
             - name: Install cross
               run: cargo install cross
 
-            - name: Install dependencies
-              working-directory: web
-              run: pnpm install
-
-            - name: Build web
-              working-directory: web
-              run: pnpm build
-
             # Update version number in engine/Cargo.toml
             # If tag is a release use that
             # Otherwise use the version number in the engine/Cargo.toml and append it with -alpha
@@ -109,13 +123,14 @@ jobs:
             packages: write
         needs: # Wait for other jobs to finish
             - build-engine
+            - build-web
         strategy:
-          matrix:
-            platform:
-                - arch: x86_64-unknown-linux-musl
-                  docker: linux/amd64
-                - arch: aarch64-unknown-linux-musl
-                  docker: linux/arm64
+            matrix:
+                platform:
+                    - arch: x86_64-unknown-linux-musl
+                      docker: linux/amd64
+                    - arch: aarch64-unknown-linux-musl
+                      docker: linux/arm64
         steps:
             - name: Checkout
               uses: actions/checkout@v4
@@ -133,6 +148,12 @@ jobs:
                   chmod 755 ./artifacts/edgeserver
                   ls -la ./artifacts
 
+            - name: Download web artifacts
+              uses: actions/download-artifact@v4
+              with:
+                  name: www
+                  path: artifacts
+
             # Set up QEMU for multi-arch builds
             - name: Set up QEMU
               uses: docker/setup-qemu-action@v3
@@ -200,48 +221,48 @@ jobs:
         needs: # Wait for other jobs to finish
             - docker-build
         steps:
-        - name: Checkout
-          uses: actions/checkout@v4
-
-        # 📥 Grab our digests
-        - name: Download digests
-          uses: actions/download-artifact@v4
-          with:
-            path: /tmp/digests
-            pattern: digests-*
-            merge-multiple: true
-
-        # Log into GitHub's container registry
-        - name: Log in to the Container registry
-          uses: docker/login-action@v3
-          with:
-            registry: ${{ env.REGISTRY }}
-            username: ${{ github.actor }}
-            password: ${{ secrets.GITHUB_TOKEN }}
-
-        # Set up Docker Buildx
-        - name: Set up Docker Buildx
-          uses: docker/setup-buildx-action@v3
-
-        # Extract metadata
-        - name: Extract metadata (tags, labels) for Docker
-          id: meta
-          uses: docker/metadata-action@v5
-          with:
-            images: ${{ env.REGISTRY }}/${{ env.ENGINE_IMAGE_NAME }}
-            tags: |
-                type=semver,pattern={{version}}
-                type=semver,pattern={{major}}.{{minor}}
-                type=semver,pattern={{major}}
-                type=edge
-                type=sha
-
-        - name: Create manifest list and push
-          working-directory: /tmp/digests
-          run: |
-            docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ env.REGISTRY }}/${{ env.ENGINE_IMAGE_NAME }}@sha256:%s ' *)
-
-        - name: Inspect image
-          run: |
-            docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ env.ENGINE_IMAGE_NAME }}:${{ steps.meta.outputs.version }}
+            - name: Checkout
+              uses: actions/checkout@v4
+
+            # 📥 Grab our digests
+            - name: Download digests
+              uses: actions/download-artifact@v4
+              with:
+                  path: /tmp/digests
+                  pattern: digests-*
+                  merge-multiple: true
+
+            # Log into GitHub's container registry
+            - name: Log in to the Container registry
+              uses: docker/login-action@v3
+              with:
+                  registry: ${{ env.REGISTRY }}
+                  username: ${{ github.actor }}
+                  password: ${{ secrets.GITHUB_TOKEN }}
+
+            # Set up Docker Buildx
+            - name: Set up Docker Buildx
+              uses: docker/setup-buildx-action@v3
+
+            # Extract metadata
+            - name: Extract metadata (tags, labels) for Docker
+              id: meta
+              uses: docker/metadata-action@v5
+              with:
+                  images: ${{ env.REGISTRY }}/${{ env.ENGINE_IMAGE_NAME }}
+                  tags: |
+                      type=semver,pattern={{version}}
+                      type=semver,pattern={{major}}.{{minor}}
+                      type=semver,pattern={{major}}
+                      type=edge
+                      type=sha
+
+            - name: Create manifest list and push
+              working-directory: /tmp/digests
+              run: |
+                  docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+                  $(printf '${{ env.REGISTRY }}/${{ env.ENGINE_IMAGE_NAME }}@sha256:%s ' *)
+
+            - name: Inspect image
+              run: |
+                  docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ env.ENGINE_IMAGE_NAME }}:${{ steps.meta.outputs.version }}