Skip to content

GitLab

Commit de41954a authored by Thomas Löffler's avatar Thomas Löffler
Browse files

Update to PHP 7.2

parent 234569db
Pipeline #5857 failed with stages
in 11 seconds
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
View file @ de41954a
......@@ -9,22 +9,22 @@ variables:
PRODUCTION_HOST: "typo3.org"
DUMP_USER: "tthreeorgstage"
DUMP_EXCLUDE_TABLES_LIST: "be_groups,be_sessions,be_users,cf_cache_hash,cf_cache_hash_tags,cf_cache_imagesizes,cf_cache_imagesizes_tags,cf_cache_news_category,cf_cache_news_category_tags,cf_cache_pages,cf_cache_pages_tags,cf_cache_pagesection,cf_cache_pagesection_tags,cf_cache_rootline,cf_cache_rootline_tags,cf_extbase_datamapfactory_datamap,cf_extbase_datamapfactory_datamap_tags,cf_extbase_object,cf_extbase_object_tags,cf_extbase_reflection,cf_extbase_reflection_tags,cf_tx_solr,cf_tx_solr_configuration,cf_tx_solr_configuration_tags,cf_tx_solr_tags,fe_groups,fe_sessions,fe_users,sys_domain,sys_log,tx_solr_cache,tx_solr_cache_tags"
PHP_EXECUTABLE: "/opt/php/php70/bin/php"
PHP_EXECUTABLE: "/opt/php/php72/bin/php"
build:
stage: build
image: composer:1
variables:
GIT_STRATEGY: "clone"
GIT_STRATEGY: "none"
before_script:
- export COMPOSER_CACHE_DIR=/cache/composer
- composer config store-auths false
- composer config http-basic.git-t3o.typo3.org gitlab-ci-token ${CI_BUILD_TOKEN}
- export COMPOSER_CACHE_DIR=/cache/composer
- composer config store-auths false
- composer config http-basic.git-t3o.typo3.org gitlab-ci-token ${CI_BUILD_TOKEN}
script:
- composer install --no-dev
- composer install --no-dev
artifacts:
paths:
- ./
- ./
expire_in: '1h'
except:
- assets
......@@ -33,20 +33,20 @@ layout:
stage: layout
image: node:8
before_script:
- cd private/typo3conf/ext/t3olayout/Build
- npm config set cache /cache/npm
- cd private/typo3conf/ext/t3olayout/Build
- npm config set cache /cache/npm
script:
- npm install
- npm run build
- rm -Rf node_modules
- npm install
- npm run build
- rm -Rf node_modules
artifacts:
paths:
- ./
- ./
expire_in: '7d'
dependencies:
- build
- build
except:
- assets
- assets
.deploy-template: &deploy_template
stage: deploy
......@@ -54,18 +54,18 @@ layout:
name: "torvitas/deployer:4.0.0-alpine"
entrypoint: [""]
before_script:
- mkdir -p /root/.ssh/
- eval $(ssh-agent -s)
- echo "$SSH_PRIVATE_KEY_STAGE" | ssh-add -
- echo "$SSH_PRIVATE_KEY_PRODUCTION" | ssh-add -
- ssh-keyscan -p ${STAGE_PORT} ${STAGE_HOST} >> /root/.ssh/known_hosts
- ssh-keyscan -p ${PRODUCTION_PORT} ${PRODUCTION_HOST} >> /root/.ssh/known_hosts
- mkdir -p /root/.ssh/
- eval $(ssh-agent -s)
- echo "$SSH_PRIVATE_KEY_STAGE" | ssh-add -
- echo "$SSH_PRIVATE_KEY_PRODUCTION" | ssh-add -
- ssh-keyscan -p ${STAGE_PORT} ${STAGE_HOST} >> /root/.ssh/known_hosts
- ssh-keyscan -p ${PRODUCTION_PORT} ${PRODUCTION_HOST} >> /root/.ssh/known_hosts
script:
- dep -vvv -f./.gitlab-ci/deployer/deploy.php deploy ${CI_BUILD_REF_NAME}
- dep -f./.gitlab-ci/deployer/deploy.php deploy ${CI_BUILD_REF_NAME}
dependencies:
- layout
- layout
except:
- assets
- assets
deploy-develop:
<<: *deploy_template
......@@ -73,5 +73,5 @@ deploy-develop:
name: develop
url: https://${STAGE_HOST}
only:
- develop
- task/new-server
- develop
- task/new-server
.gitlab-ci/deployer/deploy.php
View file @ de41954a
......@@ -53,7 +53,6 @@ set('rsync', [
set('rsync_src', './');
set('keep_releases', 10);
serverList('.gitlab-ci/deployer/servers.yml');
set('php', '/opt/php/php72/bin/php');
set('bin_folder', 'vendor/bin/');
task('typo3', function () {
......
.gitlab-ci/deployer/servers.yml
View file @ de41954a
......@@ -5,6 +5,7 @@ master:
user: tthreeorg
forward_agent: true
deploy_path: ~/ci
php: /opt/php/php70/bin/php
develop:
stage: stage
host: srv200.typo3.org
......@@ -19,3 +20,4 @@ task/new-server:
writable_mode: chmod
forward_agent: true
deploy_path: ~/ci
php: /opt/php/php72/bin/php
composer.json
View file @ de41954a
......@@ -70,7 +70,7 @@
},
"config": {
"platform": {
"php": "7.0.30"
"php": "7.2.13"
}
},
"extra": {
......
composer.lock
View file @ de41954a
......@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "3b080cfe818b8d5e89e40b132047846d",
"content-hash": "ac43f1cb459089a690623926eb9ceb84",
"packages": [
{
"name": "adoy/fastcgi-client",
......@@ -440,30 +440,30 @@
},
{
"name": "doctrine/annotations",
"version": "v1.4.0",
"version": "v1.6.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/annotations.git",
"reference": "54cacc9b81758b14e3ce750f205a393d52339e97"
"reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/annotations/zipball/54cacc9b81758b14e3ce750f205a393d52339e97",
"reference": "54cacc9b81758b14e3ce750f205a393d52339e97",
"url": "https://api.github.com/repos/doctrine/annotations/zipball/c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5",
"reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5",
"shasum": ""
},
"require": {
"doctrine/lexer": "1.*",
"php": "^5.6 || ^7.0"
"php": "^7.1"
},
"require-dev": {
"doctrine/cache": "1.*",
"phpunit/phpunit": "^5.7"
"phpunit/phpunit": "^6.4"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.4.x-dev"
"dev-master": "1.6.x-dev"
}
},
"autoload": {
......@@ -504,37 +504,42 @@
"docblock",
"parser"
],
"time": "2017-02-24T16:22:25+00:00"
"time": "2017-12-06T07:11:42+00:00"
},
{
"name": "doctrine/cache",
"version": "v1.6.2",
"version": "v1.8.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/cache.git",
"reference": "eb152c5100571c7a45470ff2a35095ab3f3b900b"
"reference": "d768d58baee9a4862ca783840eca1b9add7a7f57"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/cache/zipball/eb152c5100571c7a45470ff2a35095ab3f3b900b",
"reference": "eb152c5100571c7a45470ff2a35095ab3f3b900b",
"url": "https://api.github.com/repos/doctrine/cache/zipball/d768d58baee9a4862ca783840eca1b9add7a7f57",
"reference": "d768d58baee9a4862ca783840eca1b9add7a7f57",
"shasum": ""
},
"require": {
"php": "~5.5|~7.0"
"php": "~7.1"
},
"conflict": {
"doctrine/common": ">2.2,<2.4"
},
"require-dev": {
"phpunit/phpunit": "~4.8|~5.0",
"predis/predis": "~1.0",
"satooshi/php-coveralls": "~0.6"
"alcaeus/mongo-php-adapter": "^1.1",
"doctrine/coding-standard": "^4.0",
"mongodb/mongodb": "^1.1",
"phpunit/phpunit": "^7.0",
"predis/predis": "~1.0"
},
"suggest": {
"alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.6.x-dev"
"dev-master": "1.8.x-dev"
}
},
"autoload": {
......@@ -569,29 +574,29 @@
}
],
"description": "Caching library offering an object-oriented API for many cache backends",
"homepage": "http://www.doctrine-project.org",
"homepage": "https://www.doctrine-project.org",
"keywords": [
"cache",
"caching"
],
"time": "2017-07-22T12:49:21+00:00"
"time": "2018-08-21T18:01:43+00:00"
},
{
"name": "doctrine/collections",
"version": "v1.4.0",
"version": "v1.5.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/collections.git",
"reference": "1a4fb7e902202c33cce8c55989b945612943c2ba"
"reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/collections/zipball/1a4fb7e902202c33cce8c55989b945612943c2ba",
"reference": "1a4fb7e902202c33cce8c55989b945612943c2ba",
"url": "https://api.github.com/repos/doctrine/collections/zipball/a01ee38fcd999f34d9bfbcee59dbda5105449cbf",
"reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf",
"shasum": ""
},
"require": {
"php": "^5.6 || ^7.0"
"php": "^7.1"
},
"require-dev": {
"doctrine/coding-standard": "~0.1@dev",
......@@ -641,7 +646,7 @@
"collections",
"iterator"
],
"time": "2017-01-03T10:49:41+00:00"
"time": "2017-07-22T10:37:32+00:00"
},
{
"name": "doctrine/common",
......@@ -789,20 +794,20 @@
},
{
"name": "doctrine/inflector",
"version": "v1.2.0",
"version": "v1.3.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/inflector.git",
"reference": "e11d84c6e018beedd929cff5220969a3c6d1d462"
"reference": "5527a48b7313d15261292c149e55e26eae771b0a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/inflector/zipball/e11d84c6e018beedd929cff5220969a3c6d1d462",
"reference": "e11d84c6e018beedd929cff5220969a3c6d1d462",
"url": "https://api.github.com/repos/doctrine/inflector/zipball/5527a48b7313d15261292c149e55e26eae771b0a",
"reference": "5527a48b7313d15261292c149e55e26eae771b0a",
"shasum": ""
},
"require": {
"php": "^7.0"
"php": "^7.1"
},
"require-dev": {
"phpunit/phpunit": "^6.2"
......@@ -810,7 +815,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.2.x-dev"
"dev-master": "1.3.x-dev"
}
},
"autoload": {
......@@ -852,7 +857,7 @@
"singularize",
"string"
],
"time": "2017-07-22T12:18:28+00:00"
"time": "2018-01-09T20:05:19+00:00"
},
{
"name": "doctrine/instantiator",
......@@ -2177,32 +2182,32 @@
},
{
"name": "symfony/debug",
"version": "v3.4.20",
"version": "v4.2.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
"reference": "a2233f555ddf55e5600f386fba7781cea1cb82d3"
"reference": "e0a2b92ee0b5b934f973d90c2f58e18af109d276"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/a2233f555ddf55e5600f386fba7781cea1cb82d3",
"reference": "a2233f555ddf55e5600f386fba7781cea1cb82d3",
"url": "https://api.github.com/repos/symfony/debug/zipball/e0a2b92ee0b5b934f973d90c2f58e18af109d276",
"reference": "e0a2b92ee0b5b934f973d90c2f58e18af109d276",
"shasum": ""
},
"require": {
"php": "^5.5.9|>=7.0.8",
"php": "^7.1.3",
"psr/log": "~1.0"
},
"conflict": {
"symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
"symfony/http-kernel": "<3.4"
},
"require-dev": {
"symfony/http-kernel": "~2.8|~3.0|~4.0"
"symfony/http-kernel": "~3.4|~4.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.4-dev"
"dev-master": "4.2-dev"
}
},
"autoload": {
......@@ -2229,7 +2234,7 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
"time": "2018-11-27T12:43:10+00:00"
"time": "2018-11-28T18:24:18+00:00"
},
{
"name": "symfony/dependency-injection",
......@@ -3399,6 +3404,6 @@
"platform": [],
"platform-dev": [],
"platform-overrides": {
"php": "7.0.30"
"php": "7.2.13"
}
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment