From 0e72990cead6897f1fd0a2f1c72bbda2fff2d028 Mon Sep 17 00:00:00 2001
From: Ethan Mosbaugh <ethan@replicated.com>
Date: Mon, 8 Jul 2024 15:58:39 -0700
Subject: [PATCH] fix: kots release failure

---
 .github/workflows/regression.yaml | 5 +++--
 .github/workflows/release.yaml    | 1 +
 web/Makefile                      | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/regression.yaml b/.github/workflows/regression.yaml
index ffe7b1efe1..4a6aaf6be7 100644
--- a/.github/workflows/regression.yaml
+++ b/.github/workflows/regression.yaml
@@ -84,7 +84,7 @@ jobs:
     needs: [get-workspace-name, get-workspace-expiration]
     runs-on: ubuntu-20.04
     container:
-      image: hashicorp/terraform:1.0.11
+      image: hashicorp/terraform:1.9
     env:
       WORKSPACE: ${{ needs.get-workspace-name.outputs.name }}
     steps:
@@ -147,7 +147,7 @@ jobs:
     needs: [get-workspace-name, get-workspace-expiration, jumpbox]
     runs-on: ubuntu-20.04
     container:
-      image: hashicorp/terraform:1.0.11
+      image: hashicorp/terraform:1.9
     env:
       WORKSPACE: ${{ needs.get-workspace-name.outputs.name }}
     strategy:
@@ -269,6 +269,7 @@ jobs:
       - name: Wait for instance to be ready
         working-directory: automation/cluster
         run: |
+          set -e
           apk update && apk add aws-cli jq
           terraform output -raw control_plane_instance_id
           until [ -n "$(aws ec2 describe-instance-status --instance-ids "$(terraform output -raw control_plane_instance_id)" --filter Name=instance-status.reachability,Values=passed | jq -r '.InstanceStatuses[].InstanceStatus.Details[].Status')" ]
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index da4e6faecb..bb1aa174ed 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -6,6 +6,7 @@ on:
       - "v*.*.*"
     branches:
       - main
+      - emosbaugh/sc-108186/fix-kots-release-failures
 
 permissions:
   contents: write
diff --git a/web/Makefile b/web/Makefile
index 972f788292..ba27de0f0d 100644
--- a/web/Makefile
+++ b/web/Makefile
@@ -39,6 +39,7 @@ build-local:
 
 .PHONY: build-kotsadm
 build-kotsadm:
+	rm -rf dist
 	KOTSADM_BUILD_VERSION=$(GIT_TAG) \
 	node \
 		--max_old_space_size=6144 \