From bc7b339cf834b8c434e1406ec05951fec686ef05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oddbj=C3=B8rn=20Gr=C3=B8dem?=
 <29732646+oddgrd@users.noreply.github.com>
Date: Fri, 9 Dec 2022 17:11:41 +0100
Subject: [PATCH] Feat/set examples submodule to main (#520)

* feat: revert examples submodule back to main

* feat: un-ignore actix tests
---
 .gitmodules                            | 3 +--
 cargo-shuttle/tests/integration/run.rs | 2 --
 e2e/tests/integration/actix_web.rs     | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 9645e2053..77e658142 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,3 @@
 [submodule "examples"]
 	path = examples
-	url = git@github.com:oddgrd/examples.git
-	branch = feat/bump-dependencies
+	url = git@github.com:shuttle-hq/examples.git
diff --git a/cargo-shuttle/tests/integration/run.rs b/cargo-shuttle/tests/integration/run.rs
index 0998c2751..318145ffb 100644
--- a/cargo-shuttle/tests/integration/run.rs
+++ b/cargo-shuttle/tests/integration/run.rs
@@ -168,8 +168,6 @@ async fn rocket_authentication() {
     );
 }
 
-// TODO: remove ignore when updated examples are merged: https://github.com/shuttle-hq/examples/pull/4
-#[ignore]
 #[tokio::test(flavor = "multi_thread")]
 async fn actix_web_hello_world() {
     let port = cargo_shuttle_run("../examples/actix-web/hello-world").await;
diff --git a/e2e/tests/integration/actix_web.rs b/e2e/tests/integration/actix_web.rs
index ff3c05b34..f6a545889 100644
--- a/e2e/tests/integration/actix_web.rs
+++ b/e2e/tests/integration/actix_web.rs
@@ -2,8 +2,6 @@ use crossterm::style::Color;
 
 use crate::helpers::{self, APPS_FQDN};
 
-// TODO: remove ignore when updated examples are merged: https://github.com/shuttle-hq/examples/pull/4
-#[ignore]
 #[test]
 fn hello_world_actix_web() {
     let client = helpers::Services::new_docker(