From b2cbab1df2061c355c309699203f8bbae06f4c05 Mon Sep 17 00:00:00 2001
From: chesedo <pieter@chesedo.me>
Date: Wed, 30 Nov 2022 10:42:11 +0200
Subject: [PATCH] ci: add static-folder

---
 .circleci/config.yml                 | 2 ++
 CONTRIBUTING.md                      | 1 +
 Makefile                             | 1 +
 deployer/prepare.sh                  | 3 ++-
 e2e/tests/integration/helpers/mod.rs | 7 ++++++-
 5 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d0006a6170..fb5844eef1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -89,6 +89,7 @@ commands:
             shuttle-persist = { path = "$PWD/resources/persist" }
             shuttle-shared-db = { path = "$PWD/resources/shared-db" }
             shuttle-secrets = { path = "$PWD/resources/secrets" }
+            shuttle-static-folder = { path = "$PWD/resources/static-folder }
             EOF
   install-rust:
     steps:
@@ -260,6 +261,7 @@ workflows:
                 - resources/persist
                 - resources/secrets
                 - resources/shared-db
+                - resources/static-folder
       - service-test:
           requires:
             - workspace-clippy
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 40a3328922..42d0c0c475 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -44,6 +44,7 @@ shuttle-aws-rds = { path = "[base]/shuttle/resources/aws-rds" }
 shuttle-persist = { path = "[base]/shuttle/resources/persist" }
 shuttle-shared-db = { path = "[base]/shuttle/resources/shared-db" }
 shuttle-secrets = { path = "[base]/shuttle/resources/secrets" }
+shuttle-static-folder = { path = "[base]/shuttle/resources/static-folder" }
 ```
 
 Prime gateway database with an admin user:
diff --git a/Makefile b/Makefile
index 8ba720726a..e04b5791d3 100644
--- a/Makefile
+++ b/Makefile
@@ -188,6 +188,7 @@ publish: publish-resources publish-cargo-shuttle
 publish-resources: publish-resources/aws-rds \
 	publish-resources/persist \
 	publish-resources/shared-db
+	publish-resources/static-folder
 
 publish-cargo-shuttle: publish-resources/secrets
 	cd cargo-shuttle; cargo publish
diff --git a/deployer/prepare.sh b/deployer/prepare.sh
index c12581b197..3bbe3dc53a 100755
--- a/deployer/prepare.sh
+++ b/deployer/prepare.sh
@@ -12,7 +12,8 @@ shuttle-service = { path = "/usr/src/shuttle/service" }
 shuttle-aws-rds = { path = "/usr/src/shuttle/resources/aws-rds" }
 shuttle-persist = { path = "/usr/src/shuttle/resources/persist" }
 shuttle-shared-db = { path = "/usr/src/shuttle/resources/shared-db" }
-shuttle-secrets = { path = "/usr/src/shuttle/resources/secrets" }' > $CARGO_HOME/config.toml
+shuttle-secrets = { path = "/usr/src/shuttle/resources/secrets" }
+shuttle-static-folder = { path = "/usr/src/shuttle/resources/static-folder" }' > $CARGO_HOME/config.toml
 
 # Prefetch crates.io index
 cd /usr/src/shuttle/service
diff --git a/e2e/tests/integration/helpers/mod.rs b/e2e/tests/integration/helpers/mod.rs
index f2c1269fe2..e61c20f0bf 100644
--- a/e2e/tests/integration/helpers/mod.rs
+++ b/e2e/tests/integration/helpers/mod.rs
@@ -42,12 +42,17 @@ shuttle-service = {{ path = "{}" }}
 shuttle-aws-rds = {{ path = "{}" }}
 shuttle-persist = {{ path = "{}" }}
 shuttle-shared-db = {{ path = "{}" }}
-shuttle-secrets = {{ path = "{}" }}"#,
+shuttle-secrets = {{ path = "{}" }}
+shuttle-static-folder = {{ path = "{}" }}"#,
                     WORKSPACE_ROOT.join("service").display(),
                     WORKSPACE_ROOT.join("resources").join("aws-rds").display(),
                     WORKSPACE_ROOT.join("resources").join("persist").display(),
                     WORKSPACE_ROOT.join("resources").join("shared-db").display(),
                     WORKSPACE_ROOT.join("resources").join("secrets").display(),
+                    WORKSPACE_ROOT
+                        .join("resources")
+                        .join("static-folder")
+                        .display(),
                 )
                 .unwrap();