From cb3fdc44e21e5e54da0258acef5194c8691a8dd2 Mon Sep 17 00:00:00 2001
From: Mathieu Lagace <thekilleurcraft@gmail.com>
Date: Sun, 4 Aug 2019 19:26:54 -0400
Subject: [PATCH] MIse a jour Ci/Cd

---
 .gitlab-ci.yml  | 14 +++++++-------
 Envoy.blade.php |  6 ++++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1d125cf4..126fba70 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,19 +10,19 @@ variables:
   DB_USERNAME: root
 
 stages:
-  - test
-  - deploy_697
-  - deploy_736
+  - build
+  - deploy
+  - deploy
 
-unit_test:
-  stage: test
+build:
+  stage: build
   script:
     - cp .env.example .env
     - composer install
     - php artisan key:generate
 
 deploy_697:
-  stage: deploy_697
+  stage: deploy
   script:
     - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
     - eval $(ssh-agent -s)
@@ -38,7 +38,7 @@ deploy_697:
     - master
 
 deploy_736:
-  stage: deploy_736
+  stage: deploy
   script:
     - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
     - eval $(ssh-agent -s)
diff --git a/Envoy.blade.php b/Envoy.blade.php
index d4068b8a..744778eb 100644
--- a/Envoy.blade.php
+++ b/Envoy.blade.php
@@ -54,7 +54,8 @@
     chmod -R 777 {{ $app_dir_697 }}/current/bootstrap/
 
     echo 'Migrate DB'
-    {{ $app_dir_697 }}/current/php artisan migrate
+    cd {{ $app_dir_697 }}/current/
+    php artisan migrate
 @endtask
 
 @task('clone_repository_736')
@@ -86,5 +87,6 @@
     chmod -R 777 {{ $app_dir_736 }}/current/bootstrap/
 
     echo 'Migrate DB'
-    {{ $app_dir_736 }}/current/php artisan migrate
+    cd {{ $app_dir_736 }}/current/
+    php artisan migrate
 @endtask
\ No newline at end of file