Merge branch 'devel-no-build' into 'devel'

Remove build phase & composer <7

See merge request wpdesk/plugin-template!15

.gitlab-ci.yml

-#1.10.9
+#1.10.10
 before_script:
   - cd ${CI_PROJECT_DIR}
 
@@ -13,15 +13,12 @@ variables:
   GIT_STRATEGY: fetch
 
 stages:
-  - build
   - tests
   - pre-deploy
   - deploy
 
 .template: &job-test-template
   stage: tests
-  dependencies:
-    - build php
   coverage: '/^\s*Lines:\s*\d+.\d+\%/'
   only:
     - devel
@@ -34,24 +31,17 @@ stages:
   script:
     - ls -l
     - php --version
+    - composer update --no-progress
     - if [[ -f tests/integration/prepare.sh ]]; then sh tests/integration/prepare.sh; fi
     - composer phpunit-integration
 
 .template: &job-test-unit-template
   <<: *job-test-template
-  script:
-    - ls -l
-    - php --version
-    - composer phpunit-unit
-
-.template: &job-test-integration-oldphp-template
-  <<: *job-test-integration-template
   script:
     - ls -l
     - php --version
     - composer update --no-progress
-    - if [[ -f tests/integration/prepare.sh ]]; then sh tests/integration/prepare.sh; fi
-    - composer phpunit-integration
+    - composer phpunit-unit
 
 .template: &job-deploy-template
   image: wpdesknet/amazon-svn-deploy
@@ -63,18 +53,6 @@ stages:
   only:
     - tags
 
-build php:
-  image: wpdesknet/phpunit-woocommerce:0-0
-  stage: build
-  artifacts:
-    expire_in: 1 day
-    name: "dev vendor"
-    paths:
-      - vendor/
-  script:
-    - ls /usr/local/bin
-    - composer install --no-progress
-
 code style test:
   <<: *job-test-template
   image: wpdesknet/phpunit-woocommerce:0-0
@@ -105,17 +83,17 @@ integration test php-7 wc-3:
   image: wpdesknet/phpunit-woocommerce:2-3
 
 integration test php5-6:
-  <<: *job-test-integration-oldphp-template
+  <<: *job-test-integration-template
   image: wpdesknet/phpunit-woocommerce:3-0
 
 integration test php5-5:
-  <<: *job-test-integration-oldphp-template
+  <<: *job-test-integration-template
   image: wpdesknet/phpunit-woocommerce:4-0
 
 apigen docs:
   image:
     name: wpdesknet/apigen
-  stage: build
+  stage: pre-deploy
   artifacts:
     expire_in: 1 day
     name: "docs"

composer.json

@@ -10,7 +10,7 @@
         "php": ">=5.5"
     },
     "require-dev": {
-        "phpunit/phpunit": "*",
+        "phpunit/phpunit": "<7",
         "wp-coding-standards/wpcs": "^0.14.1",
         "squizlabs/php_codesniffer": "^3.0.2",
         "mockery/mockery": "*",

composer.lock

@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "ab79cfb4a1a3de35a971fb4fedc9b4a5",
-    "content-hash": "12219163e8f6b69c0711dc250b74948b",
+    "hash": "4ad60f363791f75b46e3742d98362f17",
+    "content-hash": "fbe9484d5b1553b31036f938fd32f97b",
     "packages": [],
     "packages-dev": [
         {