From f1f3b92167a4e640a27b00a04a7d603dee611f81 Mon Sep 17 00:00:00 2001
From: Craig O'Donnell <craig@replicated.com>
Date: Tue, 2 Jan 2024 19:42:55 +0000
Subject: [PATCH] revert web build changes

---
 .github/workflows/build-test.yaml | 7 +------
 .github/workflows/release.yaml    | 8 +-------
 deploy/melange.yaml.tmpl          | 1 +
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml
index badbdc25d1..78406fd85f 100644
--- a/.github/workflows/build-test.yaml
+++ b/.github/workflows/build-test.yaml
@@ -266,7 +266,7 @@ jobs:
 
   build-kotsadm:
     runs-on: ubuntu-20.04
-    needs: [ can-run-ci, build-web, generate-tag ]
+    needs: [ can-run-ci, generate-tag ]
     permissions:
       id-token: write # required to be able to assume the GCP SA identity to pull private Chainguard packages.
     steps:
@@ -283,11 +283,6 @@ jobs:
         with:
           ref: ${{github.event.pull_request.head.ref}}
           repository: ${{github.event.pull_request.head.repo.full_name}}
-      - name: Download web artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: web
-          path: ./web/dist
       - uses: ./.github/actions/build-push-kotsadm-image
         with:
           chainguard-gcp-wif-pool: ${{ secrets.CHAINGUARD_GCP_WIF_POOL }}
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index d37db9ab93..0f2266236c 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -112,19 +112,13 @@ jobs:
 
   build-kotsadm:
     runs-on: ubuntu-20.04
-    needs: [build-web, generate-tag]
+    needs: [generate-tag]
     permissions:
       id-token: write # required to be able to assume the GCP SA identity to pull private Chainguard packages.
     steps:
     - name: Checkout
       uses: actions/checkout@v4
 
-    - name: Download web artifact
-      uses: actions/download-artifact@v4
-      with:
-        name: web
-        path: ./web/dist
-
     - uses: ./.github/actions/build-push-kotsadm-image
       with:
         chainguard-gcp-wif-pool: ${{ secrets.CHAINGUARD_GCP_WIF_POOL }}
diff --git a/deploy/melange.yaml.tmpl b/deploy/melange.yaml.tmpl
index 7057eaa6e1..8f38f6553a 100644
--- a/deploy/melange.yaml.tmpl
+++ b/deploy/melange.yaml.tmpl
@@ -60,6 +60,7 @@ pipeline:
       # Configure Yarn
       yarn install --pure-lockfile --network-concurrency 1
 
+      make -C web deps build-kotsadm
       make kots build
 
       mv bin/kotsadm "${DESTDIR}/kotsadm"