Fix CI / CD woodpecker pipeline

- Combination of `labels` and `matrix`-build is broken
This commit is contained in:
Philipp 2022-07-17 02:25:04 +02:00
parent a6db7dfa8b
commit 5f6f432a80
No known key found for this signature in database
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
# This prevents executing this pipeline at other servers than ci.friendi.ca # This prevents executing this pipeline at other servers than ci.friendi.ca
labels: labels:
location: friendica location: friendica
@ -39,7 +34,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'
@ -50,7 +45,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
# This prevents executing this pipeline at other servers than ci.friendi.ca # This prevents executing this pipeline at other servers than ci.friendi.ca
labels: labels:
location: friendica location: friendica
@ -37,7 +32,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'
@ -47,7 +42,7 @@ pipeline:
repo: friendica/friendica-addons repo: friendica/friendica-addons
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