Fix CI / CD woodpecker pipeline

- Combination of `labels` and `matrix`-build is broken

diff --git a/.woodpecker/.continuous-deployment.yml b/.woodpecker/.continuous-deployment.yml
index 9270c9a009bf2c4fa2000594f1ba9cbc5ac20521..cdf898e14f0d6e8050abd738eda6c468be486d09 100644 (file)
--- 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 4b592d99c4b8439d545fb2e3159e578dc0f88922..8761b2fe589a833ce4c93cdef36427a48699b723 100644 (file)
--- 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