test_v1

uryvskiy-dima · Sep 24, 2023 · 6535c05 · 6535c05
1 parent 9af0849
commit 6535c05
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 24 deletions.
diff --git 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
@@ -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
@@ -6,6 +6,8 @@ services:
       context: ./.docker
     volumes:
       - ./:/code
+    env_file:
+      - ./.env
     depends_on:
       - db
   db: