Merge branch 'main' into jr/options-to-limit-cpu-mem

railwayapp · Aug 18, 2023 · 7355947 · 7355947
2 parents cc70fd4 + 6e6cd71
commit 7355947
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 84 deletions.
diff --git a/examples/zig-gyro/.gitignore b/examples/zig-gyro/.gitignore
diff --git a/examples/zig-gyro/build.zig b/examples/zig-gyro/build.zig
diff --git a/examples/zig-gyro/gyro.lock b/examples/zig-gyro/gyro.lock
diff --git a/examples/zig-gyro/gyro.zzz b/examples/zig-gyro/gyro.zzz
diff --git a/examples/zig-gyro/src/main.zig b/examples/zig-gyro/src/main.zig
diff --git a/tests/docker_run_tests.rs b/tests/docker_run_tests.rs
@@ -894,14 +894,6 @@ async fn test_zig() {
     assert!(output.contains("Hello from Zig"));
 }
 
-#[tokio::test]
-async fn test_zig_gyro() {
-    let name = simple_build("./examples/zig-gyro").await;
-    let output = run_image(&name, None).await;
-    assert!(output.contains("Hello from Zig"));
-    assert!(output.contains("The URI scheme of GitHub is https."));
-}
-
 #[tokio::test]
 async fn test_ruby_2() {
     let name = simple_build("./examples/ruby-2").await;

diff --git a/tests/generate_plan_tests.rs b/tests/generate_plan_tests.rs
@@ -107,27 +107,6 @@ fn test_haskell_stack() {
     );
 }
 
-#[cfg(any(target_arch = "aarch64", target_arch = "x86_64", target_arch = "i386"))]
-#[test]
-fn test_zig_gyro() {
-    let plan = simple_gen_plan("./examples/zig-gyro");
-    let install = plan.get_phase("install").unwrap().clone();
-    let build = plan.get_phase("build").unwrap();
-    let start = plan.start_phase.clone().unwrap();
-
-    assert_eq!(
-        build.cmds,
-        Some(vec!["zig build -Drelease-safe=true".to_string()])
-    );
-    assert_eq!(start.cmd, Some("./zig-out/bin/zig-gyro".to_string()));
-    assert!(install
-        .cmds
-        .unwrap()
-        .get(0)
-        .unwrap()
-        .contains("mkdir /gyro"));
-}
-
 #[test]
 fn test_node_turborepo_custom_app() {
     let plan = generate_build_plan(