revert web build changes

replicatedhq · Jan 2, 2024 · f1f3b92 · f1f3b92
1 parent 47d706c
commit f1f3b92
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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"