Merge pull request #2789 from lann/remove-grain-swift

Update templates for mandatory componentization
fermyon · Aug 30, 2024 · 7583fc5 · 7583fc5
2 parents 09de9c3 + 199ebf1
commit 7583fc5
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 66 deletions.
diff --git a/crates/templates/src/manager.rs b/crates/templates/src/manager.rs
@@ -566,7 +566,7 @@ mod tests {
         }
     }
 
-    const TPLS_IN_THIS: usize = 12;
+    const TPLS_IN_THIS: usize = 11;
 
     #[tokio::test]
     async fn can_install_into_new_directory() {

diff --git a/templates/http-grain/content/main.gr b/templates/http-grain/content/main.gr
@@ -1,3 +1,7 @@
-print("content-type: text/plain")
-print("")
-print("Hello, World")
+module Main
+
+provide let _start = () => {
+  print("content-type: text/plain")
+  print("")
+  print("Hello, World")
+}
diff --git a/templates/http-grain/content/spin.toml b/templates/http-grain/content/spin.toml
@@ -15,5 +15,5 @@ executor = { type = "wagi" }
 source = "main.wasm"
 allowed_outbound_hosts = []
 [component.{{project-name | kebab_case}}.build]
-command = "grain compile --release -o main.wasm main.gr"
+command = "grain compile --release --use-start-section -o main.wasm main.gr"
 watch = ["**/*.gr"]
diff --git a/templates/http-swift/content/.gitignore b/templates/http-swift/content/.gitignore
diff --git a/templates/http-swift/content/main.swift b/templates/http-swift/content/main.swift
diff --git a/templates/http-swift/content/spin.toml b/templates/http-swift/content/spin.toml
diff --git a/templates/http-swift/metadata/spin-template.toml b/templates/http-swift/metadata/spin-template.toml
diff --git a/tests/integration.rs b/tests/integration.rs
@@ -628,7 +628,6 @@ Caused by:
     #[test]
     #[cfg(target_arch = "x86_64")]
     #[cfg(feature = "extern-dependencies-tests")]
-    #[ignore = "https://github.com/fermyon/spin/issues/2774"]
     fn http_grain_template_smoke_test() -> anyhow::Result<()> {
         http_smoke_test_template(
             "http-grain",
@@ -655,21 +654,6 @@ Caused by:
         )
     }
 
-    #[test]
-    #[cfg(feature = "extern-dependencies-tests")]
-    #[ignore = "https://github.com/fermyon/spin/issues/2774"]
-    fn http_swift_template_smoke_test() -> anyhow::Result<()> {
-        http_smoke_test_template(
-            "http-swift",
-            None,
-            None,
-            &[],
-            |_| Ok(()),
-            HashMap::default(),
-            "Hello from WAGI/1!\n",
-        )
-    }
-
     #[test]
     #[cfg(feature = "extern-dependencies-tests")]
     fn http_php_template_smoke_test() -> anyhow::Result<()> {