mirror of
https://github.com/FriendsOfTYPO3/tea.git
synced 2024-11-23 05:36:16 +01:00
[BUGFIX] Fix to GitLab regression (#158)
Co-authored-by: Łukasz Uznański <l.uznanski@macopedia.com>
This commit is contained in:
parent
283ef5e9eb
commit
3177d45497
1 changed files with 26 additions and 17 deletions
|
@ -11,11 +11,6 @@ include:
|
||||||
- template: SAST.gitlab-ci.yml
|
- template: SAST.gitlab-ci.yml
|
||||||
- template: Code-Quality.gitlab-ci.yml
|
- template: Code-Quality.gitlab-ci.yml
|
||||||
|
|
||||||
default:
|
|
||||||
image: php:7.4
|
|
||||||
before_script:
|
|
||||||
- bash .gitlab/build/docker_install.sh > /dev/null
|
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
MYSQL_ROOT_PASSWORD: root
|
MYSQL_ROOT_PASSWORD: root
|
||||||
typo3DatabaseName: typo3
|
typo3DatabaseName: typo3
|
||||||
|
@ -23,7 +18,13 @@ variables:
|
||||||
typo3DatabaseUsername: root
|
typo3DatabaseUsername: root
|
||||||
typo3DatabasePassword: root
|
typo3DatabasePassword: root
|
||||||
|
|
||||||
|
.default:
|
||||||
|
image: php:7.4
|
||||||
|
before_script:
|
||||||
|
- bash .gitlab/build/docker_install.sh > /dev/null
|
||||||
|
|
||||||
build-composer-dependencies:
|
build-composer-dependencies:
|
||||||
|
extends: .default
|
||||||
stage: build
|
stage: build
|
||||||
needs: []
|
needs: []
|
||||||
variables:
|
variables:
|
||||||
|
@ -43,6 +44,7 @@ build-composer-dependencies:
|
||||||
- .Build
|
- .Build
|
||||||
|
|
||||||
php-lint-php7.2:
|
php-lint-php7.2:
|
||||||
|
extends: .default
|
||||||
image: php:7.2
|
image: php:7.2
|
||||||
stage: lint
|
stage: lint
|
||||||
needs: []
|
needs: []
|
||||||
|
@ -50,6 +52,7 @@ php-lint-php7.2:
|
||||||
- composer ci:php:lint
|
- composer ci:php:lint
|
||||||
|
|
||||||
php-lint-php7.3:
|
php-lint-php7.3:
|
||||||
|
extends: .default
|
||||||
image: php:7.3
|
image: php:7.3
|
||||||
stage: lint
|
stage: lint
|
||||||
needs: []
|
needs: []
|
||||||
|
@ -57,6 +60,7 @@ php-lint-php7.3:
|
||||||
- composer ci:php:lint
|
- composer ci:php:lint
|
||||||
|
|
||||||
php-lint-php7.4:
|
php-lint-php7.4:
|
||||||
|
extends: .default
|
||||||
image: php:7.4
|
image: php:7.4
|
||||||
stage: lint
|
stage: lint
|
||||||
needs: []
|
needs: []
|
||||||
|
@ -64,6 +68,7 @@ php-lint-php7.4:
|
||||||
- composer ci:php:lint
|
- composer ci:php:lint
|
||||||
|
|
||||||
ts-lint:
|
ts-lint:
|
||||||
|
extends: .default
|
||||||
stage: lint
|
stage: lint
|
||||||
needs:
|
needs:
|
||||||
- build-composer-dependencies
|
- build-composer-dependencies
|
||||||
|
@ -71,6 +76,7 @@ ts-lint:
|
||||||
- composer ci:ts:lint
|
- composer ci:ts:lint
|
||||||
|
|
||||||
json-lint:
|
json-lint:
|
||||||
|
extends: .default
|
||||||
stage: lint
|
stage: lint
|
||||||
needs:
|
needs:
|
||||||
- build-composer-dependencies
|
- build-composer-dependencies
|
||||||
|
@ -78,6 +84,7 @@ json-lint:
|
||||||
- composer ci:json:lint
|
- composer ci:json:lint
|
||||||
|
|
||||||
yaml-lint:
|
yaml-lint:
|
||||||
|
extends: .default
|
||||||
stage: lint
|
stage: lint
|
||||||
needs:
|
needs:
|
||||||
- build-composer-dependencies
|
- build-composer-dependencies
|
||||||
|
@ -85,6 +92,7 @@ yaml-lint:
|
||||||
- composer ci:yaml:lint
|
- composer ci:yaml:lint
|
||||||
|
|
||||||
xliff-lint:
|
xliff-lint:
|
||||||
|
extends: .default
|
||||||
stage: lint
|
stage: lint
|
||||||
needs:
|
needs:
|
||||||
- build-composer-dependencies
|
- build-composer-dependencies
|
||||||
|
@ -94,6 +102,7 @@ xliff-lint:
|
||||||
--noout $(find Resources -name '*.xlf')
|
--noout $(find Resources -name '*.xlf')
|
||||||
|
|
||||||
unit-php7.2-v10:
|
unit-php7.2-v10:
|
||||||
|
extends: .default
|
||||||
image: php:7.2
|
image: php:7.2
|
||||||
stage: test
|
stage: test
|
||||||
needs:
|
needs:
|
||||||
|
@ -104,6 +113,7 @@ unit-php7.2-v10:
|
||||||
- composer ci:tests:unit
|
- composer ci:tests:unit
|
||||||
|
|
||||||
unit-php7.3-v10:
|
unit-php7.3-v10:
|
||||||
|
extends: .default
|
||||||
image: php:7.3
|
image: php:7.3
|
||||||
stage: test
|
stage: test
|
||||||
needs:
|
needs:
|
||||||
|
@ -114,6 +124,7 @@ unit-php7.3-v10:
|
||||||
- composer ci:tests:unit
|
- composer ci:tests:unit
|
||||||
|
|
||||||
unit-php7.4-v10:
|
unit-php7.4-v10:
|
||||||
|
extends: .default
|
||||||
image: php:7.4
|
image: php:7.4
|
||||||
stage: test
|
stage: test
|
||||||
needs:
|
needs:
|
||||||
|
@ -124,6 +135,7 @@ unit-php7.4-v10:
|
||||||
- composer ci:tests:unit
|
- composer ci:tests:unit
|
||||||
|
|
||||||
func-php7.2-v10:
|
func-php7.2-v10:
|
||||||
|
extends: .default
|
||||||
image: php:7.2
|
image: php:7.2
|
||||||
services:
|
services:
|
||||||
- mariadb:10
|
- mariadb:10
|
||||||
|
@ -136,6 +148,7 @@ func-php7.2-v10:
|
||||||
- composer ci:tests:functional
|
- composer ci:tests:functional
|
||||||
|
|
||||||
func-php7.3-v10:
|
func-php7.3-v10:
|
||||||
|
extends: .default
|
||||||
image: php:7.3
|
image: php:7.3
|
||||||
services:
|
services:
|
||||||
- mariadb:10
|
- mariadb:10
|
||||||
|
@ -148,6 +161,7 @@ func-php7.3-v10:
|
||||||
- composer ci:tests:functional
|
- composer ci:tests:functional
|
||||||
|
|
||||||
func-php7.4-v10:
|
func-php7.4-v10:
|
||||||
|
extends: .default
|
||||||
image: php:7.4
|
image: php:7.4
|
||||||
services:
|
services:
|
||||||
- mariadb:10
|
- mariadb:10
|
||||||
|
@ -160,6 +174,7 @@ func-php7.4-v10:
|
||||||
- composer ci:tests:functional
|
- composer ci:tests:functional
|
||||||
|
|
||||||
unit-php7.2-v9:
|
unit-php7.2-v9:
|
||||||
|
extends: .default
|
||||||
image: php:7.2
|
image: php:7.2
|
||||||
stage: test
|
stage: test
|
||||||
dependencies: []
|
dependencies: []
|
||||||
|
@ -171,6 +186,7 @@ unit-php7.2-v9:
|
||||||
- composer ci:tests:unit
|
- composer ci:tests:unit
|
||||||
|
|
||||||
unit-php7.3-v9:
|
unit-php7.3-v9:
|
||||||
|
extends: .default
|
||||||
image: php:7.3
|
image: php:7.3
|
||||||
stage: test
|
stage: test
|
||||||
dependencies: []
|
dependencies: []
|
||||||
|
@ -182,6 +198,7 @@ unit-php7.3-v9:
|
||||||
- composer ci:tests:unit
|
- composer ci:tests:unit
|
||||||
|
|
||||||
unit-php7.4-v9:
|
unit-php7.4-v9:
|
||||||
|
extends: .default
|
||||||
image: php:7.4
|
image: php:7.4
|
||||||
stage: test
|
stage: test
|
||||||
dependencies: []
|
dependencies: []
|
||||||
|
@ -193,6 +210,7 @@ unit-php7.4-v9:
|
||||||
- composer ci:tests:unit
|
- composer ci:tests:unit
|
||||||
|
|
||||||
func-php7.2-v9:
|
func-php7.2-v9:
|
||||||
|
extends: .default
|
||||||
image: php:7.2
|
image: php:7.2
|
||||||
services:
|
services:
|
||||||
- mariadb:10
|
- mariadb:10
|
||||||
|
@ -206,6 +224,7 @@ func-php7.2-v9:
|
||||||
- composer ci:tests:functional
|
- composer ci:tests:functional
|
||||||
|
|
||||||
func-php7.3-v9:
|
func-php7.3-v9:
|
||||||
|
extends: .default
|
||||||
image: php:7.3
|
image: php:7.3
|
||||||
services:
|
services:
|
||||||
- mariadb:10
|
- mariadb:10
|
||||||
|
@ -219,6 +238,7 @@ func-php7.3-v9:
|
||||||
- composer ci:tests:functional
|
- composer ci:tests:functional
|
||||||
|
|
||||||
func-php7.4-v9:
|
func-php7.4-v9:
|
||||||
|
extends: .default
|
||||||
image: php:7.4
|
image: php:7.4
|
||||||
services:
|
services:
|
||||||
- mariadb:10
|
- mariadb:10
|
||||||
|
@ -232,6 +252,7 @@ func-php7.4-v9:
|
||||||
- composer ci:tests:functional
|
- composer ci:tests:functional
|
||||||
|
|
||||||
phpcs:
|
phpcs:
|
||||||
|
extends: .default
|
||||||
stage: codestyle
|
stage: codestyle
|
||||||
needs:
|
needs:
|
||||||
- build-composer-dependencies
|
- build-composer-dependencies
|
||||||
|
@ -240,15 +261,3 @@ phpcs:
|
||||||
- php-lint-php7.4
|
- php-lint-php7.4
|
||||||
script:
|
script:
|
||||||
- composer ci:php:sniff
|
- composer ci:php:sniff
|
||||||
|
|
||||||
code_quality:
|
|
||||||
before_script: []
|
|
||||||
|
|
||||||
eslint-sast:
|
|
||||||
before_script: []
|
|
||||||
|
|
||||||
phpcs-security-audit-sast:
|
|
||||||
before_script: []
|
|
||||||
|
|
||||||
secret_detection:
|
|
||||||
before_script: []
|
|
||||||
|
|
Loading…
Reference in a new issue