From 1ae8b13d9c70dd77958c6bf482bfa73f39b38db5 Mon Sep 17 00:00:00 2001
From: Sven Sauleau <sven@cloudflare.com>
Date: Wed, 4 Jan 2023 12:34:19 +0000
Subject: [PATCH] deploy: fix

---
 .github/workflows/deploy.yml | 4 +++-
 tf/main.tf                   | 8 ++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 6984388..30d5e00 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -51,6 +51,7 @@ jobs:
 
       - name: Configure
         run: terraform plan && terraform apply -auto-approve
+        continue-on-error: true
         working-directory: ./tf
         env:
           TF_VAR_cloudflare_account_id: ${{ secrets.CF_ACCOUNT_ID }}
@@ -64,7 +65,8 @@ jobs:
           apiToken: ${{ secrets.CF_API_TOKEN }}
           preCommands: |
             echo "*** pre commands ***"
-            yarn
+            yarn build
+            cp -rv ./frontend/dist/* .
             echo "******"
           command: pages publish --project-name=wildebeest-${{ github.actor }} .
         env:
diff --git a/tf/main.tf b/tf/main.tf
index 753d024..d8298c2 100644
--- a/tf/main.tf
+++ b/tf/main.tf
@@ -37,7 +37,7 @@ resource "cloudflare_workers_kv_namespace" "wildebeest_cache" {
   title = "wildebeest-cache"
 }
 
-resource "random_string" "user_key" {
+resource "random_password" "user_key" {
   length           = 256
   special          = false
 }
@@ -46,10 +46,6 @@ resource "cloudflare_pages_project" "wildebeest_pages_project" {
   account_id = var.cloudflare_account_id
   name              = "wildebeest-${var.gh_username}"
   production_branch = "main"
-  build_config {
-      build_command       = "yarn build"
-      destination_dir     = "frontend/dist"
-  }
   deployment_configs {
     production {
       environment_variables = {
@@ -57,7 +53,7 @@ resource "cloudflare_pages_project" "wildebeest_pages_project" {
         CF_ACCOUNT_ID = ""
         CF_API_TOKEN  = ""
 
-        USER_KEY = random_string.user_key.result
+        USER_KEY = random_password.user_key.result
       }
       kv_namespaces = {
         KV_CACHE = cloudflare_workers_kv_namespace.wildebeest_cache.id