From 42869d902756d80f25706d6932147b8bb3b0bb24 Mon Sep 17 00:00:00 2001
From: TheOneWithTheBraid <the-one@with-the-braid.cf>
Date: Fri, 29 Jul 2022 13:20:53 +0200
Subject: [PATCH] chore: move to shared runners

Signed-off-by: TheOneWithTheBraid <the-one@with-the-braid.cf>
---
 .gitlab-ci.yml | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 690e368a..510f0c08 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,13 +58,13 @@ integration_test:
     # ensure the homeserver works
     - curl docker:8008/_matrix/static/ 2> /dev/null | grep "It works! Synapse is running"
   script:
+    - flutter devices
     - flutter pub get
-    - flutter test integration_test
+    - flutter test -d emulator-5554 integration_test
   tags:
-    - famedly
+    - fluffychat
     - docker
   timeout: 20m
-  when: manual
 
 # extending the default tests to test the Google-flavored builds
 integration_test_google:
@@ -72,7 +72,7 @@ integration_test_google:
   script:
     - git apply ./scripts/enable-android-google-services.patch
     - flutter pub get
-    - flutter test integration_test
+    - flutter test -d emulator-5554 integration_test
   when: manual
 
 # extending the default tests to use Conduit as local homeserver
@@ -88,7 +88,6 @@ integration_test_conduit:
     - scripts/integration-prepare-homeserver.sh
     # ensure the homeserver works
     - curl docker:8008/_matrix/static/ 2> /dev/null | grep "M_NOT_FOUND" 1> /dev/null && echo "Conduit is running!"
-  when: manual
 
 # extending the default tests to use Dendrite as local homeserver
 integration_test_dendrite:
@@ -103,7 +102,6 @@ integration_test_dendrite:
     - scripts/integration-prepare-homeserver.sh
     # ensure the homeserver works
     - curl docker:8008/_matrix/static/ 2> /dev/null | grep "404 page not found" 1> /dev/null && echo "Dendrite is running!"
-  when: manual
 
 release_mode_launches:
   image: registry.gitlab.com/famedly/company/frontend/flutter-dockerimages/integration/stable:${FLUTTER_VERSION}
@@ -114,10 +112,9 @@ release_mode_launches:
     # generate temporary release build configuration and ensure app launches
     - scripts/integration-check-release-build.sh
   tags:
-    - famedly
+    - fluffychat
     - docker
   timeout: 20m
-  when: manual
 
 release_mode_launches_google:
   extends: release_mode_launches
@@ -171,6 +168,9 @@ build_android_apk:
     when: on_success
     paths:
       - build/android/app-release.apk
+  tags:
+    - fluffychat
+    - docker
   only:
     - main
     - tags
@@ -186,6 +186,9 @@ build_android_appbundle:
     paths:
       - build/android/app-release.aab
   resource_group: playstore_release
+  tags:
+    - fluffychat
+    - docker
   only:
     - main