From 6535c059ff1cd4a92121a7e4ec826defb965468c Mon Sep 17 00:00:00 2001
From: Uryvskiy Dima <uryvskiydima@gmail.com>
Date: Sun, 24 Sep 2023 13:56:06 +0300
Subject: [PATCH] test_v1

---
 .github/workflows/presta.yml | 33 +++++++++++----------------------
 Makefile                     |  2 --
 docker-compose.yml           |  2 ++
 3 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/presta.yml b/.github/workflows/presta.yml
index b8b08ba..70b8ba1 100644
--- a/.github/workflows/presta.yml
+++ b/.github/workflows/presta.yml
@@ -17,36 +17,25 @@ jobs:
           - php-version: '7.1'
             branch: '1.7.7.0'
             composerv1: 1
-            phpunit-version: 'phpunit:6.4.3'
           - php-version: '7.2'
             branch: '1.7.7.0'
             composerv1: 1
           - php-version: '7.3'
             branch: '1.7.7.0'
             composerv1: 1
-            phpunit-version: 'phpunit:6.4.3'
-          - php-version: '7.4'
-            branch: '1.7.7.0'
-            composerv1: 1
-            phpunit-version: 'phpunit:6.4.3'
+#          - php-version: '7.4'
+#            branch: '1.7.7.0'
+#            composerv1: 1
           - php-version: '7.1'
-            branch: '1.7.7.8'
-            composerv1: 1
-            phpunit-version: 'phpunit:6.4.3'
+            branch: '1.7.8.10'
           - php-version: '7.2'
-            branch: '1.7.7.8'
-            composerv1: 1
-            coverage: 1
-            phpunit-version: 'phpunit:6.4.3'
+            branch: '1.7.8.10'
           - php-version: '7.3'
-            branch: '1.7.7.8'
-            composerv1: 1
-            phpunit-version: 'phpunit:6.4.3'
-          - php-version: '7.4'
-            branch: '1.7.7.8'
-            composerv1: 1
-            coverage: 1
-            phpunit-version: 'phpunit:6.4.3'
+            branch: '1.7.8.10'
+#          - php-version: '7.4'
+#            branch: '1.7.7.8'
+#            composerv1: 1
+#            coverage: 1
 
     services:
       mysql:
@@ -63,7 +52,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-version }}
           coverage: xdebug
-          tools: composer:v2, ${{ matrix.phpunit-version }}
+          tools: composer:v2, phpunit:6.4.3
           extensions: gd, mbstring, zip, mcrypt, pdo_mysql, dom
       - name: Start mysql service
         run: sudo /etc/init.d/mysql start
diff --git a/Makefile b/Makefile
index 37bc82a..fd60cdb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,3 @@
-include .env
-
 ROOT_DIR=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 PRESTASHOP_DIR=$(ROOT_DIR)/../PrestaShop
 FILE = $(ROOT_DIR)/VERSION
diff --git a/docker-compose.yml b/docker-compose.yml
index c41d670..35dae41 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,6 +6,8 @@ services:
       context: ./.docker
     volumes:
       - ./:/code
+    env_file:
+      - ./.env
     depends_on:
       - db
   db: