From 4861558b93e9ff063cd32b1cae30ec37d8d53211 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Tue, 2 Apr 2019 08:58:09 +0300
Subject: [PATCH 1/4] Separate CI jobs to 3 stages to allow them to be executed
 in parallel

---
 .gitlab-ci.yml | 63 +++++++++++++++++++++++++-------------------------
 1 file changed, 31 insertions(+), 32 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dbdf59f65..9d95ff7af 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,5 @@
 image: elixir:1.8.1
 
-services:
-  - name: postgres:9.6.2
-    command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
 
 variables:
   POSTGRES_DB: pleroma_test
@@ -17,56 +14,58 @@ cache:
           - deps
           - _build
 stages:
-  - lint
+  - build
   - test
-  - analysis
-  - docs_build
-  - docs_deploy
+  - deploy
 
 before_script:
   - mix local.hex --force
   - mix local.rebar --force
-  - mix deps.get
+
+build:
+  stage: build
+  script:
+  - mix deps.get --only test
   - mix compile --force
-  - mix ecto.create
-  - mix ecto.migrate
-
-lint:
-  stage: lint
-  script:
-    - mix format --check-formatted
-
-unit-testing:
-  stage: test
-  script:
-    - mix test --trace --preload-modules
-
-analysis:
-  stage: analysis
-  script:
-    - mix credo --strict --only=warnings,todo,fixme,consistency,readability
 
 docs_build:
-  stage: docs_build
-  services:
+  stage: build
   only:
   - master@pleroma/pleroma
   - develop@pleroma/pleroma
   variables:
     MIX_ENV: dev
-  before_script:
-    - mix local.hex --force
-    - mix local.rebar --force
+  script:
     - mix deps.get
     - mix compile
-  script:
     - mix docs
   artifacts:
     paths:
       - priv/static/doc
 
+unit-testing:
+  stage: test
+  services:
+  - name: postgres:9.6.2
+    command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
+  script:
+    - mix ecto.create
+    - mix ecto.migrate
+    - mix test --trace --preload-modules
+
+lint:
+  stage: test
+  script:
+    - mix format --check-formatted
+
+analysis:
+  stage: test
+  script:
+    - mix credo --strict --only=warnings,todo,fixme,consistency,readability
+
+
 docs_deploy:
-  stage: docs_deploy
+  stage: deploy
   image: alpine:3.9
   services:
   only:

From 7827b929fc9816f556dc352c572f6c2ed1f1e470 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Tue, 2 Apr 2019 09:02:21 +0300
Subject: [PATCH 2/4] huh

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9d95ff7af..9f3e8568f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,7 @@ before_script:
 build:
   stage: build
   script:
-  - mix deps.get --only test
+  - mix deps.get
   - mix compile --force
 
 docs_build:

From 5ee54d81837f7e59e942f524259f361c438dfba4 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Tue, 2 Apr 2019 09:07:58 +0300
Subject: [PATCH 3/4] what the fuck

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9f3e8568f..70fe82ee0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,6 +61,7 @@ lint:
 analysis:
   stage: test
   script:
+    - mix deps.get
     - mix credo --strict --only=warnings,todo,fixme,consistency,readability
 
 

From 8c71ea5a1a1d4b4e75debb23b801535e19353413 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Tue, 2 Apr 2019 09:13:34 +0300
Subject: [PATCH 4/4] remove reduntant services in docs deploy and change job
 names to kebab case

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 70fe82ee0..c07f1a5d3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,5 @@
 image: elixir:1.8.1
 
-
 variables:
   POSTGRES_DB: pleroma_test
   POSTGRES_USER: postgres
@@ -28,7 +27,7 @@ build:
   - mix deps.get
   - mix compile --force
 
-docs_build:
+docs-build:
   stage: build
   only:
   - master@pleroma/pleroma
@@ -65,10 +64,9 @@ analysis:
     - mix credo --strict --only=warnings,todo,fixme,consistency,readability
 
 
-docs_deploy:
+docs-deploy:
   stage: deploy
   image: alpine:3.9
-  services:
   only:
   - master@pleroma/pleroma
   - develop@pleroma/pleroma