[TASK] re-arrange Docker overlays to speedup image creation

[jirafeau_project.git] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b2cf87e7c2bb9f8725f518029216d2aadcf334f5..cddf9409209f5ad1b3ba9bbdffc83a94a97ccc65 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,10 +1,10 @@
 # Select docker image from https://hub.docker.com/_/php/
 # Select docker image from https://hub.docker.com/_/php/

-image: php:7.1
+image: php:7.3

 
 # Select what we should cache
 cache:
   paths:
 
 # Select what we should cache
 cache:
   paths:

-  - vendor/
+    - vendor/

 
 before_script:
   # Install git, the docker php image doesn't have it installed by default
 
 before_script:
   # Install git, the docker php image doesn't have it installed by default


@@ -16,24 +16,45 @@ before_script:
   # Install composer
   - curl -sS https://getcomposer.org/installer | php
   # Create composer.json file manually, since this is a project without any non-dev dependencies yet
   # Install composer
   - curl -sS https://getcomposer.org/installer | php
   # Create composer.json file manually, since this is a project without any non-dev dependencies yet

-  - php composer.phar require --dev jakub-onderka/php-parallel-lint
+  - php composer.phar require --dev php-parallel-lint/php-parallel-lint
+  - php composer.phar require --dev friendsofphp/php-cs-fixer

   # Install all project dependencies
   - php composer.phar install
 
 # Run tests
   # Install all project dependencies
   - php composer.phar install
 
 # Run tests

-## Default test with PHP7.1
+test_app_phpdefaultversion:
+  script:
+    - ./vendor/bin/parallel-lint --exclude vendor .
+    - ./vendor/bin/php-cs-fixer -vvv fix . --dry-run --diff --using-cache=no --rules=@PSR2
+
+job_lint_app_phpnextversion:
+  image: php:7.4
+  script:
+    - ./vendor/bin/parallel-lint --exclude vendor .
+    - ./vendor/bin/php-cs-fixer -vvv fix . --dry-run --diff --using-cache=no --rules=@PSR2
+  allow_failure: true
+
+# Run same tests with older supported versions
+test_app_php72:
+  image: php:7.2
+  script:
+    - ./vendor/bin/parallel-lint --exclude vendor .
+    - ./vendor/bin/php-cs-fixer -vvv fix . --dry-run --diff --using-cache=no --rules=@PSR2
+

 test_app_php71:
 test_app_php71:

+  image: php:7.1

   script:
   script:

-  - ./vendor/bin/parallel-lint --exclude vendor .
+    - ./vendor/bin/parallel-lint --exclude vendor .
+    - ./vendor/bin/php-cs-fixer -vvv fix . --dry-run --diff --using-cache=no --rules=@PSR2

 
 

-# Run same tests with PHP7.0

 test_app_php70:
   image: php:7.0
   script:
 test_app_php70:
   image: php:7.0
   script:

-  - ./vendor/bin/parallel-lint --exclude vendor .
+    - ./vendor/bin/parallel-lint --exclude vendor .
+    - ./vendor/bin/php-cs-fixer -vvv fix . --dry-run --diff --using-cache=no --rules=@PSR2

 
 

-# Run same tests with PHP5.6

 test_app_php56:
   image: php:5.6
   script:
 test_app_php56:
   image: php:5.6
   script:

-  - ./vendor/bin/parallel-lint --exclude vendor .
+    - ./vendor/bin/parallel-lint --exclude vendor .
+    - ./vendor/bin/php-cs-fixer -vvv fix . --dry-run --diff --using-cache=no --rules=@PSR2