From 2eb12557a122cdb0d297712730b1946749be5456 Mon Sep 17 00:00:00 2001
From: Andrew Lavery <laverya@umich.edu>
Date: Wed, 22 Nov 2023 20:02:41 -0500
Subject: [PATCH 1/2] use the same build step as the actual release

specifically drop buildkite
---
 .github/workflows/alpha.yaml | 37 +++++++++++++++---------------------
 1 file changed, 15 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/alpha.yaml b/.github/workflows/alpha.yaml
index c9d5a671bc..f90d936888 100644
--- a/.github/workflows/alpha.yaml
+++ b/.github/workflows/alpha.yaml
@@ -42,29 +42,22 @@ jobs:
   build_web:
     runs-on: ubuntu-20.04
     needs: [generate-tag]
-    container:
-      image: replicated/gitops-builder:buildkite
-      options: --user root
     steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-
-    - name: Setup Node.js environment
-      uses: actions/setup-node@v3
-      with:
-        node-version: '17.x'
-
-    - name: Build web
-      env:
-        GIT_TAG: ${{ needs.generate-tag.outputs.tag }}
-      run: mapfile -t envs < <(grep -v '#.*' < .image.env) && export "${envs[@]}" && make -C web deps build-kotsadm
-      shell: bash
-
-    - name: Upload web artifact
-      uses: actions/upload-artifact@v3
-      with:
-        name: web
-        path: ./web/dist
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v3
+        with:
+          node-version: '17.x'
+      - name: Build web
+        env:
+          GIT_TAG: ${{ needs.generate-tag.outputs.tag }}
+        run: mapfile -t envs < <(grep -v '#.*' < .image.env) && export "${envs[@]}" && make -C web deps build-kotsadm
+      - name: Upload web artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: web
+          path: ./web/dist
 
 
   build_kurl_proxy:

From 542d1a5d1b40e27191be691a4d0db03408289253 Mon Sep 17 00:00:00 2001
From: Andrew Lavery <laverya@umich.edu>
Date: Wed, 22 Nov 2023 20:06:25 -0500
Subject: [PATCH 2/2] indentation

---
 .github/workflows/alpha.yaml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/alpha.yaml b/.github/workflows/alpha.yaml
index f90d936888..fe193f3593 100644
--- a/.github/workflows/alpha.yaml
+++ b/.github/workflows/alpha.yaml
@@ -43,21 +43,21 @@ jobs:
     runs-on: ubuntu-20.04
     needs: [generate-tag]
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v3
-        with:
-          node-version: '17.x'
-      - name: Build web
-        env:
-          GIT_TAG: ${{ needs.generate-tag.outputs.tag }}
-        run: mapfile -t envs < <(grep -v '#.*' < .image.env) && export "${envs[@]}" && make -C web deps build-kotsadm
-      - name: Upload web artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: web
-          path: ./web/dist
+    - name: Checkout
+      uses: actions/checkout@v4
+    - name: Setup Node.js environment
+      uses: actions/setup-node@v3
+      with:
+        node-version: '17.x'
+    - name: Build web
+      env:
+        GIT_TAG: ${{ needs.generate-tag.outputs.tag }}
+      run: mapfile -t envs < <(grep -v '#.*' < .image.env) && export "${envs[@]}" && make -C web deps build-kotsadm
+    - name: Upload web artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: web
+        path: ./web/dist
 
 
   build_kurl_proxy: