Merge branch 'optimizing-deployment' into 'develop'

Long expire only for layout stage and use layout artifacts only for deployment

See merge request !49

.gitlab-ci.yml

@@ -22,7 +22,7 @@ build:
     artifacts:
         paths:
             - ./
-        expire_in: '7d'
+        expire_in: '1h'
     environment: ${CI_BUILD_REF_NAME}
 
 layout:
@@ -49,6 +49,8 @@ layout:
         - echo "$SSH_PRIVATE_KEY" | ssh-add -
         - ./.gitlab-ci/scripts/deployer.sh -f/src/.gitlab-ci/deployer/deploy.php deploy ${CI_BUILD_REF_NAME}
     when: manual
+    dependencies:
+        - layout
 
 deploy-master:
     <<: *deploy_template

composer.json

@@ -27,7 +27,7 @@
     "helhum/typo3-console": "4.1.2",
     "dmitryd/typo3-realurl": "^2.1",
     "apache-solr-for-typo3/solr": "^6.0",
-    "t3o/t3olayout": "dev-master"
+    "t3o/t3olayout": "dev-develop"
   },
   "config": {
     "bin-dir": "bin",

composer.lock

@@ -4,8 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "26982d9f82bef372c305c1222157d6cb",
-    "content-hash": "ef31fc60ecb77d0d1f9bdc79ed26c3c6",
+    "content-hash": "ef350ae3312b48fc403b665c1f379f2e",
     "packages": [
         {
             "name": "apache-solr-for-typo3/solr",
@@ -69,7 +68,7 @@
                 "solr",
                 "typo3"
             ],
-            "time": "2016-12-14 08:52:44"
+            "time": "2016-12-14T08:52:44+00:00"
         },
         {
             "name": "cogpowered/finediff",
@@ -120,7 +119,7 @@
                 "string",
                 "text"
             ],
-            "time": "2014-05-19 10:25:02"
+            "time": "2014-05-19T10:25:02+00:00"
         },
         {
             "name": "dmitryd/typo3-realurl",
@@ -185,7 +184,7 @@
                 "cms",
                 "typo3"
             ],
-            "time": "2017-02-13 00:00:00"
+            "time": "2017-02-13T00:00:00+00:00"
         },
         {
             "name": "doctrine/instantiator",
@@ -239,7 +238,7 @@
                 "constructor",
                 "instantiate"
             ],
-            "time": "2015-06-14 21:17:01"
+            "time": "2015-06-14T21:17:01+00:00"
         },
         {
             "name": "helhum/typo3-console",
@@ -324,7 +323,7 @@
                 "console",
                 "typo3"
             ],
-            "time": "2017-01-12 01:21:41"
+            "time": "2017-01-12T01:21:41+00:00"
         },
         {
             "name": "helhum/typo3-console-plugin",
@@ -379,7 +378,7 @@
                 "plugin",
                 "typo3 console"
             ],
-            "time": "2017-01-26 11:55:03"
+            "time": "2017-01-26T11:55:03+00:00"
         },
         {
             "name": "mso/idna-convert",
@@ -429,7 +428,7 @@
                 "idna",
                 "php"
             ],
-            "time": "2016-01-06 21:05:46"
+            "time": "2016-01-06T21:05:46+00:00"
         },
         {
             "name": "pear/http_request2",
@@ -488,7 +487,7 @@
                 "http",
                 "request"
             ],
-            "time": "2016-02-13 20:20:39"
+            "time": "2016-02-13T20:20:39+00:00"
         },
         {
             "name": "pear/net_url2",
@@ -549,7 +548,7 @@
                 "uri",
                 "url"
             ],
-            "time": "2016-04-18 22:24:01"
+            "time": "2016-04-18T22:24:01+00:00"
         },
         {
             "name": "pear/pear_exception",
@@ -604,7 +603,7 @@
             "keywords": [
                 "exception"
             ],
-            "time": "2015-02-10 20:07:52"
+            "time": "2015-02-10T20:07:52+00:00"
         },
         {
             "name": "psr/http-message",
@@ -654,7 +653,7 @@
                 "request",
                 "response"
             ],
-            "time": "2016-08-06 14:39:51"
+            "time": "2016-08-06T14:39:51+00:00"
         },
         {
             "name": "psr/log",
@@ -701,7 +700,7 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2016-10-10 12:19:37"
+            "time": "2016-10-10T12:19:37+00:00"
         },
         {
             "name": "swiftmailer/swiftmailer",
@@ -755,7 +754,7 @@
                 "mail",
                 "mailer"
             ],
-            "time": "2017-02-13 07:52:53"
+            "time": "2017-02-13T07:52:53+00:00"
         },
         {
             "name": "symfony/console",
@@ -816,7 +815,7 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2017-02-06 12:04:06"
+            "time": "2017-02-06T12:04:06+00:00"
         },
         {
             "name": "symfony/debug",
@@ -873,7 +872,7 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2016-07-30 07:22:48"
+            "time": "2016-07-30T07:22:48+00:00"
         },
         {
             "name": "symfony/finder",
@@ -922,7 +921,7 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2017-01-02 20:30:24"
+            "time": "2017-01-02T20:30:24+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
@@ -981,7 +980,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2016-11-14 01:06:16"
+            "time": "2016-11-14T01:06:16+00:00"
         },
         {
             "name": "symfony/process",
@@ -1030,15 +1029,15 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2017-02-16 14:07:22"
+            "time": "2017-02-16T14:07:22+00:00"
         },
         {
             "name": "t3o/t3olayout",
-            "version": "dev-master",
+            "version": "dev-develop",
             "source": {
                 "type": "git",
                 "url": "https://git-t3o.typo3.org/t3o/t3olayout.git",
-                "reference": "2b98e1df2e6fff33d780967c674800e3a7ba7ce1"
+                "reference": "7b8b5956c3aa83f069888d4d0450d43cbb7ae562"
             },
             "type": "typo3-cms-extension",
             "autoload": {
@@ -1054,7 +1053,7 @@
             "keywords": [
                 "TYPO3 CMS"
             ],
-            "time": "2017-03-02 21:01:30"
+            "time": "2017-03-13 17:21:09"
         },
         {
             "name": "typo3/class-alias-loader",
@@ -1112,7 +1111,7 @@
                 "classloader",
                 "composer"
             ],
-            "time": "2015-10-06 10:25:44"
+            "time": "2015-10-06T10:25:44+00:00"
         },
         {
             "name": "typo3/cms",
@@ -1311,7 +1310,7 @@
                 "extbase",
                 "typo3"
             ],
-            "time": "2017-02-28 10:42:40"
+            "time": "2017-02-28T10:42:40+00:00"
         },
         {
             "name": "typo3/cms-composer-installers",
@@ -1379,7 +1378,7 @@
                 "installer",
                 "typo3"
             ],
-            "time": "2016-07-05 09:38:42"
+            "time": "2016-07-05T09:38:42+00:00"
         }
     ],
     "packages-dev": [],