From 5f6f432a80f81ef847db54b49e685c25f2ac8cb1 Mon Sep 17 00:00:00 2001 From: Philipp Date: Sun, 17 Jul 2022 02:25:04 +0200 Subject: [PATCH] Fix CI / CD woodpecker pipeline - Combination of `labels` and `matrix`-build is broken --- .woodpecker/.continuous-deployment.yml | 9 ++------- .woodpecker/.releaser.yml | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/.woodpecker/.continuous-deployment.yml b/.woodpecker/.continuous-deployment.yml index 9270c9a00..cdf898e14 100644 --- a/.woodpecker/.continuous-deployment.yml +++ b/.woodpecker/.continuous-deployment.yml @@ -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 labels: location: friendica @@ -39,7 +34,7 @@ pipeline: settings: backend: "filesystem" restore: true - cache_key: "{{ .Repo.Name }}_php${PHP_MAJOR_VERSION}_{{ arch }}_{{ os }}" + cache_key: "{{ .Repo.Name }}_php7.4_{{ arch }}_{{ os }}" archive_format: "gzip" mount: - '.composer' @@ -50,7 +45,7 @@ pipeline: branch: [ develop, '*-rc' ] event: push composer_install: - image: friendicaci/php${PHP_MAJOR_VERSION}:php${PHP_VERSION} + image: friendicaci/php7.4:php7.4.18 commands: - export COMPOSER_HOME=.composer - composer validate diff --git a/.woodpecker/.releaser.yml b/.woodpecker/.releaser.yml index 4b592d99c..8761b2fe5 100644 --- a/.woodpecker/.releaser.yml +++ b/.woodpecker/.releaser.yml @@ -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 labels: location: friendica @@ -37,7 +32,7 @@ pipeline: settings: backend: "filesystem" restore: true - cache_key: "{{ .Repo.Name }}_php${PHP_MAJOR_VERSION}_{{ arch }}_{{ os }}" + cache_key: "{{ .Repo.Name }}_php7.4_{{ arch }}_{{ os }}" archive_format: "gzip" mount: - '.composer' @@ -47,7 +42,7 @@ pipeline: repo: friendica/friendica-addons event: tag composer_install: - image: friendicaci/php${PHP_MAJOR_VERSION}:php${PHP_VERSION} + image: friendicaci/php7.4:php7.4.18 commands: - export COMPOSER_HOME=.composer - composer validate