Fix CI / CD woodpecker pipeline

- Combination of `labels` and `matrix`-build is broken
This commit is contained in:
Philipp Holzer 2022-07-17 02:26:46 +02:00
parent 1894302011
commit 3f7c98fd37
Signed by: nupplaPhil
GPG key ID: 24A7501396EB5432
2 changed files with 4 additions and 14 deletions

View file

@ -1,8 +1,3 @@
matrix:
include:
- PHP_MAJOR_VERSION: 7.4
PHP_VERSION: 7.4.18
depends_on: depends_on:
- phpunit - phpunit
- code_standards_check - code_standards_check
@ -33,7 +28,7 @@ pipeline:
settings: settings:
backend: "filesystem" backend: "filesystem"
restore: true restore: true
cache_key: "{{ .Repo.Name }}_php${PHP_MAJOR_VERSION}_{{ arch }}_{{ os }}" cache_key: "{{ .Repo.Name }}_php7.4_{{ arch }}_{{ os }}"
archive_format: "gzip" archive_format: "gzip"
mount: mount:
- '.composer' - '.composer'
@ -44,7 +39,7 @@ pipeline:
branch: [ develop, '*-rc' ] branch: [ develop, '*-rc' ]
event: push event: push
composer_install: composer_install:
image: friendicaci/php${PHP_MAJOR_VERSION}:php${PHP_VERSION} image: friendicaci/php7.4:php7.4.18
commands: commands:
- export COMPOSER_HOME=.composer - export COMPOSER_HOME=.composer
- composer validate - composer validate

View file

@ -1,8 +1,3 @@
matrix:
include:
- PHP_MAJOR_VERSION: 7.4
PHP_VERSION: 7.4.18
depends_on: depends_on:
- phpunit - phpunit
- code_standards_check - code_standards_check
@ -31,7 +26,7 @@ pipeline:
settings: settings:
backend: "filesystem" backend: "filesystem"
restore: true restore: true
cache_key: "{{ .Repo.Name }}_php${PHP_MAJOR_VERSION}_{{ arch }}_{{ os }}" cache_key: "{{ .Repo.Name }}_php7.4_{{ arch }}_{{ os }}"
archive_format: "gzip" archive_format: "gzip"
mount: mount:
- '.composer' - '.composer'
@ -42,7 +37,7 @@ pipeline:
branch: stable branch: stable
event: tag event: tag
composer_install: composer_install:
image: friendicaci/php${PHP_MAJOR_VERSION}:php${PHP_VERSION} image: friendicaci/php7.4:php7.4.18
commands: commands:
- export COMPOSER_HOME=.composer - export COMPOSER_HOME=.composer
- composer validate - composer validate