.woodpecker/build.yml

@@ -37,10 +37,9 @@ 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=beta GLUON_AUTOUPDATER_ENABLED=1 GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
+      - make -j$(nproc) GLUON_AUTOUPDATER_BRANCH=${BRANCH} GLUON_AUTOUPDATER_ENABLED=1 GLUON_RELEASE=$input_version-${BRANCH} GLUON_OUTPUTDIR=output/${BRANCH}
 
-  upload-stable:
+  upload:
     image: appleboy/drone-scp
     settings:
       host: 46.4.138.183
@@ -49,20 +48,7 @@ pipeline:
         from_secret: ssh-key
       strip_components: 2
       target: /srv/fwuploads-tmp/troisdorf/multi/
-      source: gluon/output/stable/*
-    when:
-      event: tag
-
-  upload-beta:
-    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/multi/
-      source: gluon/output/beta/*
+      source: gluon/output/${BRANCH}/*
     when:
       event: tag
 
@@ -91,6 +77,10 @@ matrix:
     - x86-generic
     - x86-geode
     - x86-legacy
+  BRANCH:
+    - stable
+    - beta
+    - experimental
 
 depends_on:
   - prepare

.woodpecker/publish.yml

@@ -1,39 +0,0 @@
----
-platform: linux/arm64
-
-workspace:
-  base: /build
-
-clone:
-  git:
-    image: woodpeckerci/plugin-git
-
-pipeline:
-  upload-version:
-    image: appleboy/drone-scp
-    settings:
-      host: 46.4.138.183
-      user: fwupload
-      key:
-        from_secret: ssh-key
-      target: /srv/fwuploads-tmp/bin/
-      source: release_state.json
-    when:
-      path: "release_state.json"
-
-  publish-firmware:
-    image: appleboy/drone-ssh
-    settings:
-      host: 46.4.138.183
-      username: fwupload
-      key:
-        from_secret: ssh-key
-      port: 22
-      command_timeout: 120m
-      script:
-        - /srv/fwuploads-tmp/bin/go-gluon-publish -s /srv/fwuploads-tmp/troisdorf/multi/ -t /srv/fwuploads/troisdorf/multi/ -b stable
-        - /srv/fwuploads-tmp/bin/go-gluon-publish -s /srv/fwuploads-tmp/troisdorf/multi/ -t /srv/fwuploads/troisdorf/multi/ -b beta
-        #- /srv/fwuploads-tmp/bin/go-gluon-publish -s /srv/fwuploads-tmp/troisdorf/multi/ -t /srv/fwuploads/troisdorf/multi/ -b experimental -d
-    when:
-      path: "release_state.json"
-      event: "push"

release_state.json

@@ -1,5 +0,0 @@
-{
-    "stable": "v2022.1.4",
-    "beta": "v2022.1.4",
-    "experimental": "v2022.1.4-z"
-}