From e03a18fc82afdfecee74883ee2631c9e5c48cd8a Mon Sep 17 00:00:00 2001
From: Xoeseko Yao Nyomi <xoeseko.nyomi@etu.unige.ch>
Date: Tue, 15 Dec 2020 19:24:10 +0100
Subject: [PATCH 1/7] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5e08514..067c8ac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,10 +14,7 @@ build:
   script:
     - flutter build aot
   artifacts:
-    paths:
-      - lib/models/Event.g.dart
-      - lib/models/User.g.dart
-      - build
+    untracked: true
 
 code_quality:
   stage: test
@@ -86,7 +83,8 @@ analyze:
     - flutter analyze
 
 release:
-  needs: []
+  dependencies:
+    - build
   stage: release
 
   before_script:
-- 
GitLab


From 6c953f154824b454a06c9e9d10bc63ddb4a4d42e Mon Sep 17 00:00:00 2001
From: Xoeseko Yao Nyomi <xoeseko.nyomi@etu.unige.ch>
Date: Tue, 15 Dec 2020 19:46:15 +0100
Subject: [PATCH 2/7] Changed where jobs execute

---
 .gitlab-ci.yml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 067c8ac..1bf6354 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,7 +38,7 @@ code_quality:
   dependencies: []
   only:
     - branches
-    - tags
+    - merge_request
 
 integration_test:
   image: bitsydarel/flutter-ci
@@ -51,6 +51,9 @@ integration_test:
 
   script:
     - flutter drive
+  only:
+    - branches
+    - merge_request
 
 unit_test:
   stage: test
@@ -71,6 +74,9 @@ unit_test:
       - report.xml
     reports:
       junit: report.xml
+  only:
+    - branches
+    - merge_request
 
 analyze:
   stage: test
@@ -81,6 +87,9 @@ analyze:
     
   script:
     - flutter analyze
+  only:
+    - branches
+    - merge_request
 
 release:
   dependencies:
-- 
GitLab


From 0b0cededae04e4b930f03f49a758a41ea2e624f5 Mon Sep 17 00:00:00 2001
From: Xoeseko Yao Nyomi <xoeseko.nyomi@etu.unige.ch>
Date: Tue, 15 Dec 2020 19:51:15 +0100
Subject: [PATCH 3/7] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1bf6354..7ed474b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,9 +36,6 @@ code_quality:
       codequality: gl-code-quality-report.json
     expire_in: 1 week
   dependencies: []
-  only:
-    - branches
-    - merge_request
 
 integration_test:
   image: bitsydarel/flutter-ci
@@ -51,9 +48,6 @@ integration_test:
 
   script:
     - flutter drive
-  only:
-    - branches
-    - merge_request
 
 unit_test:
   stage: test
@@ -74,9 +68,6 @@ unit_test:
       - report.xml
     reports:
       junit: report.xml
-  only:
-    - branches
-    - merge_request
 
 analyze:
   stage: test
@@ -87,12 +78,9 @@ analyze:
     
   script:
     - flutter analyze
-  only:
-    - branches
-    - merge_request
 
 release:
-  dependencies:
+  needs:
     - build
   stage: release
 
-- 
GitLab


From dd169cfcaa77dbdba472cf3a73b0c9b91455b0ba Mon Sep 17 00:00:00 2001
From: Xoeseko Yao Nyomi <xoeseko.nyomi@etu.unige.ch>
Date: Tue, 15 Dec 2020 19:54:11 +0100
Subject: [PATCH 4/7] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ed474b..5bfaa25 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -80,8 +80,7 @@ analyze:
     - flutter analyze
 
 release:
-  needs:
-    - build
+  needs: [build]
   stage: release
 
   before_script:
-- 
GitLab


From 2fb0e451afac1b77cde69f73fa68e372c2c615ef Mon Sep 17 00:00:00 2001
From: Xoeseko Yao Nyomi <xoeseko.nyomi@etu.unige.ch>
Date: Tue, 15 Dec 2020 19:56:32 +0100
Subject: [PATCH 5/7] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5bfaa25..88e6cfe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -80,7 +80,7 @@ analyze:
     - flutter analyze
 
 release:
-  needs: [build]
+  needs: ["build"]
   stage: release
 
   before_script:
-- 
GitLab


From b4e43c1f4a335aca495b2727f80a716e3cdac6fb Mon Sep 17 00:00:00 2001
From: Xoeseko Yao Nyomi <xoeseko.nyomi@etu.unige.ch>
Date: Tue, 15 Dec 2020 20:03:37 +0100
Subject: [PATCH 6/7] merge_request only was causing problems with the build
 dependency as they are considered independent.

---
 .gitlab-ci.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 88e6cfe..44adff2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ stages:
 
 build:
   stage: build
-
+  
   before_script:
     - flutter pub get
     - flutter packages pub run build_runner build
@@ -19,6 +19,7 @@ build:
 code_quality:
   stage: test
   image: docker:stable
+  needs: ["build"]
   allow_failure: true
   script:
     - CONTAINER_ID=$(docker ps -q -f "label=com.gitlab.gitlab-runner.job.id=${CI_JOB_ID}")
@@ -41,6 +42,7 @@ integration_test:
   image: bitsydarel/flutter-ci
   allow_failure: true
   stage: test
+  tags: flutter
   before_script:
     - flutter pub get
     - flutter pub global activate junitreport
@@ -50,6 +52,7 @@ integration_test:
     - flutter drive
 
 unit_test:
+  needs: ["build"]
   stage: test
   before_script:
     - flutter pub get
@@ -71,6 +74,7 @@ unit_test:
 
 analyze:
   stage: test
+  needs: ["build"]
   allow_failure: true
 
   before_script:
@@ -93,6 +97,3 @@ release:
   artifacts: 
     paths:
       - build/app-release.apk
-  only:
-    - merge_request
-    - master
\ No newline at end of file
-- 
GitLab


From 9f8a7827bdaca8399af284882d14571d535a46cd Mon Sep 17 00:00:00 2001
From: Xoeseko Yao Nyomi <xoeseko.nyomi@etu.unige.ch>
Date: Tue, 15 Dec 2020 20:04:34 +0100
Subject: [PATCH 7/7] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 44adff2..4fd2762 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,7 +42,8 @@ integration_test:
   image: bitsydarel/flutter-ci
   allow_failure: true
   stage: test
-  tags: flutter
+  tags: 
+    - flutter
   before_script:
     - flutter pub get
     - flutter pub global activate junitreport
-- 
GitLab