Update release_state.json

.woodpecker/build-beta.yml

@@ -1,84 +0,0 @@
----
-platform: linux/arm64
-
-variables:
-  - &default
-    image: "git.freifunk-rhein-sieg.net/freifunk-troisdorf/docker-gluon-build:latest"
-    pull: true
-    environment:
-      - input_version=${CI_COMMIT_TAG}
-      - GLUON_SITEDIR=..
-      - FORCE_UNSAFE_CONFIGURE=1
-      - GLUON_TARGET=${TARGET}
-      - GLUON_DEPRECATED=1
-
-workspace:
-  base: /build
-
-clone:
-  git:
-    image: woodpeckerci/plugin-git
-    settings:
-      recursive: true
-
-pipeline:
-  make_update:
-    <<: *default
-    commands:
-      - cd gluon
-      - make update
-
-  patch-iw-to-iw-full:
-    <<: *default
-    commands:
-      - sed -i 's/+iw /+iw-full /g' gluon/openwrt/package/kernel/mac80211/Makefile
-
-  build:
-    <<: *default
-    commands:
-      - cd gluon
-      - make -j$(nproc) GLUON_AUTOUPDATER_BRANCH=${BRANCH} GLUON_AUTOUPDATER_ENABLED=1 GLUON_RELEASE=$input_version-${BRANCH} GLUON_OUTPUTDIR=output/${BRANCH}
-
-  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/multi/
-      source: gluon/output/${BRANCH}/*
-    when:
-      event: tag
-
-matrix:
-  TARGET:
-    - ath79-generic
-    - ath79-mikrotik
-    - ath79-nand
-    - bcm27xx-bcm2708
-    - bcm27xx-bcm2709
-    - ipq40xx-generic
-    - ipq40xx-mikrotik
-    - ipq806x-generic
-    - lantiq-xrx200
-    - lantiq-xway
-    - mediatek-mt7622
-    - mpc85xx-p1010
-    - mpc85xx-p1020
-    - ramips-mt7620
-    - ramips-mt7621
-    - ramips-mt76x8
-    - realtek-rtl838x
-    - rockchip-armv8
-    - sunxi-cortexa7
-    - x86-64
-    - x86-generic
-    - x86-geode
-    - x86-legacy
-  BRANCH:
-    - beta
-
-depends_on:
-  - prepare

.woodpecker/build-experimental.yml

@@ -1,84 +0,0 @@
----
-platform: linux/arm64
-
-variables:
-  - &default
-    image: "git.freifunk-rhein-sieg.net/freifunk-troisdorf/docker-gluon-build:latest"
-    pull: true
-    environment:
-      - input_version=${CI_COMMIT_TAG}
-      - GLUON_SITEDIR=..
-      - FORCE_UNSAFE_CONFIGURE=1
-      - GLUON_TARGET=${TARGET}
-      - GLUON_DEPRECATED=1
-
-workspace:
-  base: /build
-
-clone:
-  git:
-    image: woodpeckerci/plugin-git
-    settings:
-      recursive: true
-
-pipeline:
-  make_update:
-    <<: *default
-    commands:
-      - cd gluon
-      - make update
-
-  patch-iw-to-iw-full:
-    <<: *default
-    commands:
-      - sed -i 's/+iw /+iw-full /g' gluon/openwrt/package/kernel/mac80211/Makefile
-
-  build:
-    <<: *default
-    commands:
-      - cd gluon
-      - make -j$(nproc) GLUON_AUTOUPDATER_BRANCH=${BRANCH} GLUON_AUTOUPDATER_ENABLED=1 GLUON_RELEASE=$input_version-${BRANCH} GLUON_OUTPUTDIR=output/${BRANCH}
-
-  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/multi/
-      source: gluon/output/${BRANCH}/*
-    when:
-      event: tag
-
-matrix:
-  TARGET:
-    - ath79-generic
-    - ath79-mikrotik
-    - ath79-nand
-    - bcm27xx-bcm2708
-    - bcm27xx-bcm2709
-    - ipq40xx-generic
-    - ipq40xx-mikrotik
-    - ipq806x-generic
-    - lantiq-xrx200
-    - lantiq-xway
-    - mediatek-mt7622
-    - mpc85xx-p1010
-    - mpc85xx-p1020
-    - ramips-mt7620
-    - ramips-mt7621
-    - ramips-mt76x8
-    - realtek-rtl838x
-    - rockchip-armv8
-    - sunxi-cortexa7
-    - x86-64
-    - x86-generic
-    - x86-geode
-    - x86-legacy
-  BRANCH:
-    - experimental
-
-depends_on:
-  - prepare

.woodpecker/build-stable.yml

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

.woodpecker/publish.yml

@@ -31,8 +31,9 @@ pipeline:
       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 -d
+        - /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 -d
+        - /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
+        #- /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 +1,5 @@
 {
-    "stable": "v2020.2.2",
+    "stable": "v2022.1.4",
-    "beta": "v2020.2.2",
+    "beta": "v2022.1.4",
-    "experimental": "v2022.1.4"
+    "experimental": "v2022.1.4-z"
 }