From 7a42fa88e9af6a041bd96812c7bcb5c9eef3738c Mon Sep 17 00:00:00 2001
From: Stefan <stefan@freifunk-troisdorf.de>
Date: Thu, 25 May 2023 13:19:33 +0200
Subject: [PATCH] added variable for branch

---
 .woodpecker/build.yml   | 10 +++++-----
 .woodpecker/cleanup.yml |  8 ++++----
 .woodpecker/prepare.yml |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml
index 1dcbb9f..8f31aa2 100644
--- a/.woodpecker/build.yml
+++ b/.woodpecker/build.yml
@@ -37,14 +37,14 @@ pipeline:
     <<: *default
     commands:
       - cd gluon
-      - make -j$(nproc) GLUON_AUTOUPDATER_BRANCH=stable GLUON_AUTOUPDATER_ENABLED=1 GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
+      - make -j$(nproc) GLUON_AUTOUPDATER_BRANCH=${CI_COMMIT_BRANCH} GLUON_AUTOUPDATER_ENABLED=1 GLUON_RELEASE=$input_version-${CI_COMMIT_BRANCH} GLUON_OUTPUTDIR=output/${CI_COMMIT_BRANCH}
   
   list_images:
     <<: *default
     commands:
-      - mkdir -p gluon/output/stable/images/factory
-      - echo "${TARGET}" > gluon/output/stable/images/factory/${TARGET}
-      - ls -alh gluon/output/stable/images/factory
+      - mkdir -p gluon/output/${CI_COMMIT_BRANCH}/images/factory
+      - echo "${TARGET}" > gluon/output/${CI_COMMIT_BRANCH}/images/factory/${TARGET}
+      - ls -alh gluon/output/${CI_COMMIT_BRANCH}/images/factory
 
   upload:
     image: appleboy/drone-scp
@@ -55,7 +55,7 @@ pipeline:
         from_secret: ssh-key
       strip_components: 2
       target: /srv/fwuploads-testing/troisdorf/multi/incoming/
-      source: gluon/output/stable/*
+      source: gluon/output/${CI_COMMIT_BRANCH}/*
 
 matrix:
   TARGET:
diff --git a/.woodpecker/cleanup.yml b/.woodpecker/cleanup.yml
index 8588334..e84f2f1 100644
--- a/.woodpecker/cleanup.yml
+++ b/.woodpecker/cleanup.yml
@@ -17,10 +17,10 @@ pipeline:
       port: 22
       command_timeout: 120m
       script:
-        - ls -alh /srv/fwuploads-testing/troisdorf/multi/incoming/stable
-        - rm -rf /srv/fwuploads-testing/troisdorf/multi/stable/
-        - mkdir /srv/fwuploads-testing/troisdorf/multi/stable/
-        - mv /srv/fwuploads-testing/troisdorf/multi/incoming/stable/* /srv/fwuploads-testing/troisdorf/multi/stable/
+        - ls -alh /srv/fwuploads-testing/troisdorf/multi/incoming/${CI_COMMIT_BRANCH}
+        - rm -rf /srv/fwuploads-testing/troisdorf/multi/${CI_COMMIT_BRANCH}/
+        - mkdir /srv/fwuploads-testing/troisdorf/multi/${CI_COMMIT_BRANCH}/
+        - mv /srv/fwuploads-testing/troisdorf/multi/incoming/${CI_COMMIT_BRANCH}/* /srv/fwuploads-testing/troisdorf/multi/${CI_COMMIT_BRANCH}/
 
 depends_on:
   - build
diff --git a/.woodpecker/prepare.yml b/.woodpecker/prepare.yml
index d3386cf..7500c18 100644
--- a/.woodpecker/prepare.yml
+++ b/.woodpecker/prepare.yml
@@ -14,5 +14,5 @@ pipeline:
       port: 22
       command_timeout: 120m
       script:
-        - rm -rf /srv/fwuploads-testing/troisdorf/multi/incoming/stable
-        - mkdir -p /srv/fwuploads-testing/troisdorf/multi/incoming/stable
+        - rm -rf /srv/fwuploads-testing/troisdorf/multi/incoming/${CI_COMMIT_BRANCH}
+        - mkdir -p /srv/fwuploads-testing/troisdorf/multi/incoming/${CI_COMMIT_BRANCH}