From f3ae3133f536318cc7a8b7579d73662b4d50ff29 Mon Sep 17 00:00:00 2001
From: Koen <koen@pop-os.localdomain>
Date: Mon, 26 Jun 2023 15:40:17 +0200
Subject: [PATCH] CI/CD fixes.

---
 .gitlab-ci.yml                   | 15 ++++++++++++++-
 receivers/android/.gitlab-ci.yml | 12 ------------
 website/.gitlab-ci.yml           |  3 ---
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c407756..b03257f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,16 @@
+stages:
+  - buildAndDeployApk
+  - buildAndDeployPlayStoreAab
+  - deployWebsite
+
+variables:
+  ANDROID_VERSION_NAME: 
+    value: ""
+    description: "Enter the version name here (e.g. 1.0.1)."
+  ANDROID_VERSION_CODE: 
+    value: ""
+    description: "Enter the version code here (e.g. 1)."
+
 include:
   - local: 'receivers/android/.gitlab-ci.yml'
-  - local: 'website/.gitlab-ci.yml'
+  - local: 'website/.gitlab-ci.yml'
\ No newline at end of file
diff --git a/receivers/android/.gitlab-ci.yml b/receivers/android/.gitlab-ci.yml
index d43bca9..8c82c6a 100644
--- a/receivers/android/.gitlab-ci.yml
+++ b/receivers/android/.gitlab-ci.yml
@@ -1,15 +1,3 @@
-stages:
-  - buildAndDeployApk
-  - buildAndDeployPlayStoreAab
-
-variables:
-  ANDROID_VERSION_NAME: 
-    value: ""
-    description: "Enter the version name here (e.g. 1.0.1)."
-  ANDROID_VERSION_CODE: 
-    value: ""
-    description: "Enter the version code here (e.g. 1)."
-
 buildAndDeployApk:
   stage: buildAndDeployApk
   before_script:
diff --git a/website/.gitlab-ci.yml b/website/.gitlab-ci.yml
index c1b960a..9cc74f0 100644
--- a/website/.gitlab-ci.yml
+++ b/website/.gitlab-ci.yml
@@ -1,6 +1,3 @@
-stages:
-  - deployWebsite
-
 deployWebsite:
   stage: deployWebsite
   script: