tidy up

.woodpecker/build.yml

@@ -11,8 +11,6 @@ variables:
       - FORCE_UNSAFE_CONFIGURE=1
       - GLUON_TARGET=${TARGET}
       - GLUON_DEPRECATED=1
-    when:
-      event: tag
 
 workspace:
   base: /build
@@ -39,17 +37,7 @@ pipeline:
     <<: *default
     commands:
       - cd gluon
-      - if [ -z $CI_COMMIT_TAG ]; then export input_version=dev; fi
+      - make -j$(nproc) GLUON_AUTOUPDATER_BRANCH=${BRANCH} GLUON_AUTOUPDATER_ENABLED=1 GLUON_RELEASE=$input_version-${BRANCH} GLUON_OUTPUTDIR=output/${BRANCH}
-      - echo $input_version
-      - echo $CI_COMMIT_BRANCH
-      - 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/${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
@@ -59,8 +47,8 @@ pipeline:
       key:
         from_secret: ssh-key
       strip_components: 2
-      target: /srv/fwuploads-testing/troisdorf/multi/incoming/
+      target: /srv/fwuploads-tmp/troisdorf/multi/${BRANCH}/
-      source: gluon/output/${CI_COMMIT_BRANCH}/*
+      source: gluon/output/${BRANCH}/*
     when:
       event: tag
 
@@ -89,6 +77,10 @@ matrix:
     - x86-generic
     - x86-geode
     - x86-legacy
+  branch:
+    - stable
+    - beta
+    - experimental
 
 depends_on:
   - prepare

.woodpecker/cleanup.yml

@@ -1,26 +0,0 @@
----
-platform: linux/arm64
-
-skip_clone: true
-
-workspace:
-  base: /build
-
-pipeline:
-  cleanup:
-    image: appleboy/drone-ssh
-    settings:
-      host: 46.4.138.183
-      username: fwupload
-      key:
-        from_secret: ssh-key
-      port: 22
-      command_timeout: 120m
-      script:
-        - 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

.woodpecker/next.yml

@@ -6,13 +6,14 @@ variables:
     image: "git.freifunk-rhein-sieg.net/freifunk-troisdorf/docker-gluon-build:latest"
     pull: true
     environment:
-      - input_version=${CI_COMMIT_TAG}
+      - input_version=next
       - GLUON_SITEDIR=..
       - FORCE_UNSAFE_CONFIGURE=1
       - GLUON_TARGET=${TARGET}
       - GLUON_DEPRECATED=1
     when:
       event: push
+      branch: next
 
 workspace:
   base: /build
@@ -24,6 +25,7 @@ clone:
       recursive: true
     when:
       event: push
+      branch: next
 
 pipeline:
   make_update:
@@ -41,10 +43,7 @@ pipeline:
     <<: *default
     commands:
       - cd gluon
-      - if [ -z $CI_COMMIT_TAG ]; then export input_version=dev; fi
+      - make -j$(nproc) GLUON_RELEASE=$input_version-${CI_COMMIT_BRANCH} GLUON_OUTPUTDIR=output/next
-      - echo $input_version
-      - echo $CI_COMMIT_BRANCH
-      - 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
@@ -53,6 +52,23 @@ pipeline:
       - echo "${TARGET}" > gluon/output/${CI_COMMIT_BRANCH}/images/factory/${TARGET}
       - ls -alh gluon/output/${CI_COMMIT_BRANCH}/images/factory
 
+  upload:
+    image: appleboy/drone-scp
+    settings:
+      host: 46.4.138.183
+      user: fwupload
+      key:
+        from_secret: ssh-key
+      strip_components: 2
+      target: /srv/fwuploads-tmp/troisdorf/testing/next/
+      source: gluon/output/next/*
+    when:
+      event: push
+      branch: next
+
 matrix:
   TARGET:
-    - ath79-generic
+    - ramips-mt7621
+
+depends_on:
+  - prepare_next

.woodpecker/prepare.yml

@@ -14,7 +14,10 @@ pipeline:
       port: 22
       command_timeout: 120m
       script:
-        - rm -rf /srv/fwuploads-testing/troisdorf/multi/incoming/${CI_COMMIT_BRANCH}
+        - rm -rf /srv/fwuploads-tmp/troisdorf/multi/*
-        - mkdir -p /srv/fwuploads-testing/troisdorf/multi/incoming/${CI_COMMIT_BRANCH}
+        - mkdir -p /srv/fwuploads-tmp/troisdorf/multi/stable
+        - mkdir -p /srv/fwuploads-tmp/troisdorf/multi/beta
+        - mkdir -p /srv/fwuploads-tmp/troisdorf/multi/experimental
     when:
-      event: tag
+      branch: stable
+      event: tag

.woodpecker/prepare_next.yml

@@ -0,0 +1,20 @@
+---
+platform: linux/arm64
+
+skip_clone: true
+
+pipeline:
+  prepare:
+    image: appleboy/drone-ssh
+    settings:
+      host: 46.4.138.183
+      username: fwupload
+      key:
+        from_secret: ssh-key
+      port: 22
+      command_timeout: 120m
+      script:
+        - rm -rf /srv/fwuploads-tmp/troisdorf/testing/*
+        - mkdir -p /srv/fwuploads-tmp/troisdorf/testing/
+    when:
+      branch: next

gluon

@@ -1 +1 @@
-Subproject commit 1c76fcb58b83f5cda02d92b4658df8ccc9687a94
+Subproject commit b9a621f68c909fc1de550ce165681ae14b75d915