From 289027569f6c9a6527963603bd65bafa469c2136 Mon Sep 17 00:00:00 2001 From: Nils Jakobi Date: Fri, 21 Feb 2020 20:10:56 +0100 Subject: [PATCH 01/19] now using anchors --- .drone.yml | 246 ++++++++++------------------------------------------- 1 file changed, 47 insertions(+), 199 deletions(-) diff --git a/.drone.yml b/.drone.yml index 420f0ec..1d24d06 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,5 +1,27 @@ global-variables: - input_version: &input_version v2020.1 + env: &env + image: hoffmannhosting/gluon-builder + environment: + input_version: v2020.1 + GLUON_SITEDIR: /drone/src/site + FORCE_UNSAFE_CONFIGURE: 1 + + gluon: &gluon + <<: *env + commands: + - cd gluon + - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable + - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta + - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental + + upload: &upload + image: appleboy/drone-scp + settings: + host: 46.4.138.183 + user: fwupload + key: + from_secret: ssh-update + strip_components: 6 kind: pipeline name: gluon-build @@ -20,276 +42,117 @@ steps: - git checkout multidomain - name: make update - image: hoffmannhosting/gluon-builder + <<: *env commands: - cd gluon - make update environment: - input_version: *input_version - GLUON_SITEDIR: /drone/src/site GLUON_TARGET: ar71xx-generic - FORCE_UNSAFE_CONFIGURE: 1 - name: build-ath79-generic - image: hoffmannhosting/gluon-builder - commands: - - cd gluon - - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable - - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta - - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental + <<: *gluon environment: - input_version: *input_version - GLUON_SITEDIR: /drone/src/site GLUON_TARGET: ath79-generic - FORCE_UNSAFE_CONFIGURE: 1 - name: build-ar71xx-generic - image: hoffmannhosting/gluon-builder - commands: - - cd gluon - - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable - - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta - - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental + <<: *gluon environment: - input_version: *input_version - GLUON_SITEDIR: /drone/src/site GLUON_TARGET: ar71xx-generic - FORCE_UNSAFE_CONFIGURE: 1 - name: build-ar71xx-tiny - image: hoffmannhosting/gluon-builder - commands: - - cd gluon - - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable - - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta - - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental + <<: *gluon environment: - input_version: *input_version - GLUON_SITEDIR: /drone/src/site GLUON_TARGET: ar71xx-tiny - FORCE_UNSAFE_CONFIGURE: 1 - name: build-ar71xx-nand - image: hoffmannhosting/gluon-builder - commands: - - cd gluon - - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable - - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta - - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental + <<: *gluon environment: - input_version: *input_version - GLUON_SITEDIR: /drone/src/site GLUON_TARGET: ar71xx-nand - FORCE_UNSAFE_CONFIGURE: 1 - name: build-brcm2708-bcm2708 - image: hoffmannhosting/gluon-builder - commands: - - cd gluon - - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable - - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta - - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental + <<: *gluon environment: - input_version: *input_version - GLUON_SITEDIR: /drone/src/site GLUON_TARGET: brcm2708-bcm2708 - FORCE_UNSAFE_CONFIGURE: 1 - name: build-brcm2708-bcm2709 - image: hoffmannhosting/gluon-builder - commands: - - cd gluon - - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable - - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta - - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental + <<: *gluon environment: - input_version: *input_version - GLUON_SITEDIR: /drone/src/site GLUON_TARGET: brcm2708-bcm2709 - FORCE_UNSAFE_CONFIGURE: 1 - name: build-mpc85xx-generic - image: hoffmannhosting/gluon-builder - commands: - - cd gluon - - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable - - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta - - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental + <<: *gluon environment: - input_version: *input_version - GLUON_SITEDIR: /drone/src/site GLUON_TARGET: mpc85xx-generic - FORCE_UNSAFE_CONFIGURE: 1 - name: build-mpc85xx-p1020 - image: hoffmannhosting/gluon-builder - commands: - - cd gluon - - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable - - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta - - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental + <<: *gluon environment: - input_version: *input_version - GLUON_SITEDIR: /drone/src/site GLUON_TARGET: mpc85xx-p1020 - FORCE_UNSAFE_CONFIGURE: 1 - name: build-x86-generic - image: hoffmannhosting/gluon-builder - commands: - - cd gluon - - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable - - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta - - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental + <<: *gluon environment: - input_version: *input_version - GLUON_SITEDIR: /drone/src/site GLUON_TARGET: x86-generic - FORCE_UNSAFE_CONFIGURE: 1 - name: build-x86-geode - image: hoffmannhosting/gluon-builder - commands: - - cd gluon - - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable - - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta - - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental + <<: *gluon environment: - input_version: *input_version - GLUON_SITEDIR: /drone/src/site GLUON_TARGET: x86-geode - FORCE_UNSAFE_CONFIGURE: 1 - name: build-x86-64 - image: hoffmannhosting/gluon-builder - commands: - - cd gluon - - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable - - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta - - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental + <<: *gluon environment: - input_version: *input_version - GLUON_SITEDIR: /drone/src/site GLUON_TARGET: x86-64 - FORCE_UNSAFE_CONFIGURE: 1 - name: build-ipq40xx-generic - image: hoffmannhosting/gluon-builder - commands: - - cd gluon - - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable - - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta - - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental + <<: *gluon environment: - input_version: *input_version - GLUON_SITEDIR: /drone/src/site GLUON_TARGET: ipq40xx-generic - FORCE_UNSAFE_CONFIGURE: 1 - name: ipq806x-generic - image: hoffmannhosting/gluon-builder - commands: - - cd gluon - - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable - - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta - - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental + <<: *gluon environment: - input_version: *input_version - GLUON_SITEDIR: /drone/src/site GLUON_TARGET: ipq806x-generic - FORCE_UNSAFE_CONFIGURE: 1 - name: build-ramips-mt7620 - image: hoffmannhosting/gluon-builder - commands: - - cd gluon - - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable - - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta - - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental + <<: *gluon environment: - input_version: *input_version - GLUON_SITEDIR: /drone/src/site GLUON_TARGET: ramips-mt7620 - FORCE_UNSAFE_CONFIGURE: 1 - name: build-ramips-mt7621 - image: hoffmannhosting/gluon-builder - commands: - - cd gluon - - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable - - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta - - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental + <<: *gluon environment: - input_version: *input_version - GLUON_SITEDIR: /drone/src/site GLUON_TARGET: ramips-mt7621 - FORCE_UNSAFE_CONFIGURE: 1 - name: build-ramips-mt76x8 - image: hoffmannhosting/gluon-builder - commands: - - cd gluon - - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable - - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta - - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental + <<: *gluon environment: - input_version: *input_version - GLUON_SITEDIR: /drone/src/site GLUON_TARGET: ramips-mt76x8 - FORCE_UNSAFE_CONFIGURE: 1 - name: build-ramips-rt305x - image: hoffmannhosting/gluon-builder - commands: - - cd gluon - - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable - - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta - - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental + <<: *gluon environment: - input_version: *input_version - GLUON_SITEDIR: /drone/src/site GLUON_TARGET: ramips-rt305x - FORCE_UNSAFE_CONFIGURE: 1 - name: lantiq-xway - image: hoffmannhosting/gluon-builder - commands: - - cd gluon - - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable - - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta - - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental + <<: *gluon environment: - input_version: *input_version - GLUON_SITEDIR: /drone/src/site GLUON_TARGET: lantiq-xway - FORCE_UNSAFE_CONFIGURE: 1 - name: lantiq-xrx200 - image: hoffmannhosting/gluon-builder - commands: - - cd gluon - - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable - - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta - - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental + <<: *gluon environment: - input_version: *input_version - GLUON_SITEDIR: /drone/src/site GLUON_TARGET: lantiq-xrx200 - FORCE_UNSAFE_CONFIGURE: 1 - name: make manifest - image: hoffmannhosting/gluon-builder commands: - cd gluon - make manifest GLUON_BRANCH=stable GLUON_OUTPUTDIR=output/stable GLUON_RELEASE=$input_version-stable - make manifest GLUON_BRANCH=beta GLUON_OUTPUTDIR=output/beta GLUON_RELEASE=$input_version-beta - make manifest GLUON_BRANCH=experimental GLUON_OUTPUTDIR=output/experimental GLUON_RELEASE=$input_version-exp - environment: - input_version: *input_version - GLUON_SITEDIR: /drone/src/site - FORCE_UNSAFE_CONFIGURE: 1 - name: backup-old-firmware + <<: *gluon image: appleboy/drone-ssh settings: host: 46.4.138.183 @@ -306,35 +169,20 @@ steps: - mkdir /srv/fwuploads/troisdorf/multi/experimental - name: upload stable - image: appleboy/drone-scp + <<: *upload settings: - host: 46.4.138.183 - user: fwupload - key: - from_secret: ssh-update - strip_components: 6 target: /srv/fwuploads/troisdorf/multi/stable source: /drone/src/gluon/output/stable/images/* - name: upload beta - image: appleboy/drone-scp + <<: *upload settings: - host: 46.4.138.183 - user: fwupload - key: - from_secret: ssh-update - strip_components: 6 target: /srv/fwuploads/troisdorf/multi/beta source: /drone/src/gluon/output/beta/images/* - name: upload experimental - image: appleboy/drone-scp + <<: *upload settings: - host: 46.4.138.183 - user: fwupload - key: - from_secret: ssh-update - strip_components: 6 target: /srv/fwuploads/troisdorf/multi/experimental source: /drone/src/gluon/output/experimental/images/* From 297f84b8fcb784bf7c8031649655049c081dead4 Mon Sep 17 00:00:00 2001 From: Nils Jakobi Date: Fri, 21 Feb 2020 20:28:51 +0100 Subject: [PATCH 02/19] add conditional check to upload only on master branch --- .drone.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 1d24d06..d21c74f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -22,8 +22,11 @@ global-variables: key: from_secret: ssh-update strip_components: 6 + when: + branch: master kind: pipeline +type: docker name: gluon-build clone: @@ -192,4 +195,3 @@ steps: webhook: from_secret: slack_webhook channel: fftdf_firmware - From 8849a9d2bb8cfbd192ac047964618027982904cd Mon Sep 17 00:00:00 2001 From: Nils Jakobi Date: Fri, 21 Feb 2020 20:32:02 +0100 Subject: [PATCH 03/19] debugging... --- .drone.yml | 302 ++++++++++++++++++++++++++--------------------------- 1 file changed, 151 insertions(+), 151 deletions(-) diff --git a/.drone.yml b/.drone.yml index d21c74f..4ced6ef 100644 --- a/.drone.yml +++ b/.drone.yml @@ -44,154 +44,154 @@ steps: - cd site - git checkout multidomain -- name: make update - <<: *env - commands: - - cd gluon - - make update - environment: - GLUON_TARGET: ar71xx-generic - -- name: build-ath79-generic - <<: *gluon - environment: - GLUON_TARGET: ath79-generic - -- name: build-ar71xx-generic - <<: *gluon - environment: - GLUON_TARGET: ar71xx-generic - -- name: build-ar71xx-tiny - <<: *gluon - environment: - GLUON_TARGET: ar71xx-tiny - -- name: build-ar71xx-nand - <<: *gluon - environment: - GLUON_TARGET: ar71xx-nand - -- name: build-brcm2708-bcm2708 - <<: *gluon - environment: - GLUON_TARGET: brcm2708-bcm2708 - -- name: build-brcm2708-bcm2709 - <<: *gluon - environment: - GLUON_TARGET: brcm2708-bcm2709 - -- name: build-mpc85xx-generic - <<: *gluon - environment: - GLUON_TARGET: mpc85xx-generic - -- name: build-mpc85xx-p1020 - <<: *gluon - environment: - GLUON_TARGET: mpc85xx-p1020 - -- name: build-x86-generic - <<: *gluon - environment: - GLUON_TARGET: x86-generic - -- name: build-x86-geode - <<: *gluon - environment: - GLUON_TARGET: x86-geode - -- name: build-x86-64 - <<: *gluon - environment: - GLUON_TARGET: x86-64 - -- name: build-ipq40xx-generic - <<: *gluon - environment: - GLUON_TARGET: ipq40xx-generic - -- name: ipq806x-generic - <<: *gluon - environment: - GLUON_TARGET: ipq806x-generic - -- name: build-ramips-mt7620 - <<: *gluon - environment: - GLUON_TARGET: ramips-mt7620 - -- name: build-ramips-mt7621 - <<: *gluon - environment: - GLUON_TARGET: ramips-mt7621 - -- name: build-ramips-mt76x8 - <<: *gluon - environment: - GLUON_TARGET: ramips-mt76x8 - -- name: build-ramips-rt305x - <<: *gluon - environment: - GLUON_TARGET: ramips-rt305x - -- name: lantiq-xway - <<: *gluon - environment: - GLUON_TARGET: lantiq-xway - -- name: lantiq-xrx200 - <<: *gluon - environment: - GLUON_TARGET: lantiq-xrx200 - -- name: make manifest - commands: - - cd gluon - - make manifest GLUON_BRANCH=stable GLUON_OUTPUTDIR=output/stable GLUON_RELEASE=$input_version-stable - - make manifest GLUON_BRANCH=beta GLUON_OUTPUTDIR=output/beta GLUON_RELEASE=$input_version-beta - - make manifest GLUON_BRANCH=experimental GLUON_OUTPUTDIR=output/experimental GLUON_RELEASE=$input_version-exp - -- name: backup-old-firmware - <<: *gluon - image: appleboy/drone-ssh - settings: - host: 46.4.138.183 - username: fwupload - key: - from_secret: ssh-update - port: 22 - command_timeout: 120m - script: - #- ./rsync-backup-multi.sh - - rm -rf /srv/fwuploads/troisdorf/multi/* - - mkdir /srv/fwuploads/troisdorf/multi/stable - - mkdir /srv/fwuploads/troisdorf/multi/beta - - mkdir /srv/fwuploads/troisdorf/multi/experimental - -- name: upload stable - <<: *upload - settings: - target: /srv/fwuploads/troisdorf/multi/stable - source: /drone/src/gluon/output/stable/images/* - -- name: upload beta - <<: *upload - settings: - target: /srv/fwuploads/troisdorf/multi/beta - source: /drone/src/gluon/output/beta/images/* - -- name: upload experimental - <<: *upload - settings: - target: /srv/fwuploads/troisdorf/multi/experimental - source: /drone/src/gluon/output/experimental/images/* - -- name: slack - image: plugins/slack - settings: - webhook: - from_secret: slack_webhook - channel: fftdf_firmware +# - name: make update +# <<: *env +# commands: +# - cd gluon +# - make update +# environment: +# GLUON_TARGET: ar71xx-generic +# +# - name: build-ath79-generic +# <<: *gluon +# environment: +# GLUON_TARGET: ath79-generic +# +# - name: build-ar71xx-generic +# <<: *gluon +# environment: +# GLUON_TARGET: ar71xx-generic +# +# - name: build-ar71xx-tiny +# <<: *gluon +# environment: +# GLUON_TARGET: ar71xx-tiny +# +# - name: build-ar71xx-nand +# <<: *gluon +# environment: +# GLUON_TARGET: ar71xx-nand +# +# - name: build-brcm2708-bcm2708 +# <<: *gluon +# environment: +# GLUON_TARGET: brcm2708-bcm2708 +# +# - name: build-brcm2708-bcm2709 +# <<: *gluon +# environment: +# GLUON_TARGET: brcm2708-bcm2709 +# +# - name: build-mpc85xx-generic +# <<: *gluon +# environment: +# GLUON_TARGET: mpc85xx-generic +# +# - name: build-mpc85xx-p1020 +# <<: *gluon +# environment: +# GLUON_TARGET: mpc85xx-p1020 +# +# - name: build-x86-generic +# <<: *gluon +# environment: +# GLUON_TARGET: x86-generic +# +# - name: build-x86-geode +# <<: *gluon +# environment: +# GLUON_TARGET: x86-geode +# +# - name: build-x86-64 +# <<: *gluon +# environment: +# GLUON_TARGET: x86-64 +# +# - name: build-ipq40xx-generic +# <<: *gluon +# environment: +# GLUON_TARGET: ipq40xx-generic +# +# - name: ipq806x-generic +# <<: *gluon +# environment: +# GLUON_TARGET: ipq806x-generic +# +# - name: build-ramips-mt7620 +# <<: *gluon +# environment: +# GLUON_TARGET: ramips-mt7620 +# +# - name: build-ramips-mt7621 +# <<: *gluon +# environment: +# GLUON_TARGET: ramips-mt7621 +# +# - name: build-ramips-mt76x8 +# <<: *gluon +# environment: +# GLUON_TARGET: ramips-mt76x8 +# +# - name: build-ramips-rt305x +# <<: *gluon +# environment: +# GLUON_TARGET: ramips-rt305x +# +# - name: lantiq-xway +# <<: *gluon +# environment: +# GLUON_TARGET: lantiq-xway +# +# - name: lantiq-xrx200 +# <<: *gluon +# environment: +# GLUON_TARGET: lantiq-xrx200 +# +# - name: make manifest +# commands: +# - cd gluon +# - make manifest GLUON_BRANCH=stable GLUON_OUTPUTDIR=output/stable GLUON_RELEASE=$input_version-stable +# - make manifest GLUON_BRANCH=beta GLUON_OUTPUTDIR=output/beta GLUON_RELEASE=$input_version-beta +# - make manifest GLUON_BRANCH=experimental GLUON_OUTPUTDIR=output/experimental GLUON_RELEASE=$input_version-exp +# +# - name: backup-old-firmware +# <<: *gluon +# image: appleboy/drone-ssh +# settings: +# host: 46.4.138.183 +# username: fwupload +# key: +# from_secret: ssh-update +# port: 22 +# command_timeout: 120m +# script: +# #- ./rsync-backup-multi.sh +# - rm -rf /srv/fwuploads/troisdorf/multi/* +# - mkdir /srv/fwuploads/troisdorf/multi/stable +# - mkdir /srv/fwuploads/troisdorf/multi/beta +# - mkdir /srv/fwuploads/troisdorf/multi/experimental +# +# - name: upload stable +# <<: *upload +# settings: +# target: /srv/fwuploads/troisdorf/multi/stable +# source: /drone/src/gluon/output/stable/images/* +# +# - name: upload beta +# <<: *upload +# settings: +# target: /srv/fwuploads/troisdorf/multi/beta +# source: /drone/src/gluon/output/beta/images/* +# +# - name: upload experimental +# <<: *upload +# settings: +# target: /srv/fwuploads/troisdorf/multi/experimental +# source: /drone/src/gluon/output/experimental/images/* +# +# - name: slack +# image: plugins/slack +# settings: +# webhook: +# from_secret: slack_webhook +# channel: fftdf_firmware From 751bdb02485da9bed19f1493fd8a7735b06119ae Mon Sep 17 00:00:00 2001 From: Nils Jakobi Date: Fri, 21 Feb 2020 20:32:49 +0100 Subject: [PATCH 04/19] testing more --- .drone.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.drone.yml b/.drone.yml index 4ced6ef..6d202e2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -44,14 +44,14 @@ steps: - cd site - git checkout multidomain -# - name: make update -# <<: *env -# commands: -# - cd gluon -# - make update -# environment: -# GLUON_TARGET: ar71xx-generic -# + - name: make update + <<: *env + commands: + - cd gluon + - make update + environment: + GLUON_TARGET: ar71xx-generic + # - name: build-ath79-generic # <<: *gluon # environment: From 0b18bc77bef923faf558674bca2c460887295a5a Mon Sep 17 00:00:00 2001 From: Nils Jakobi Date: Fri, 21 Feb 2020 20:37:01 +0100 Subject: [PATCH 05/19] more testing --- .drone.yml | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/.drone.yml b/.drone.yml index 6d202e2..38460e0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -44,13 +44,13 @@ steps: - cd site - git checkout multidomain - - name: make update - <<: *env - commands: - - cd gluon - - make update - environment: - GLUON_TARGET: ar71xx-generic +# - name: make update +# <<: *env +# commands: +# - cd gluon +# - make update +# environment: +# GLUON_TARGET: ar71xx-generic # - name: build-ath79-generic # <<: *gluon @@ -170,6 +170,8 @@ steps: # - mkdir /srv/fwuploads/troisdorf/multi/stable # - mkdir /srv/fwuploads/troisdorf/multi/beta # - mkdir /srv/fwuploads/troisdorf/multi/experimental +# when: +# branch: master # # - name: upload stable # <<: *upload @@ -183,11 +185,11 @@ steps: # target: /srv/fwuploads/troisdorf/multi/beta # source: /drone/src/gluon/output/beta/images/* # -# - name: upload experimental -# <<: *upload -# settings: -# target: /srv/fwuploads/troisdorf/multi/experimental -# source: /drone/src/gluon/output/experimental/images/* + - name: upload experimental + <<: *upload + settings: + target: /srv/fwuploads/troisdorf/multi/experimental + source: /drone/src/gluon/output/experimental/images/* # # - name: slack # image: plugins/slack From 96c0b82aafa7f286af6d02edd565ad53563d35d5 Mon Sep 17 00:00:00 2001 From: Nils Jakobi Date: Fri, 21 Feb 2020 20:37:43 +0100 Subject: [PATCH 06/19] trying to fix anchors --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 38460e0..57aaf63 100644 --- a/.drone.yml +++ b/.drone.yml @@ -185,7 +185,7 @@ steps: # target: /srv/fwuploads/troisdorf/multi/beta # source: /drone/src/gluon/output/beta/images/* # - - name: upload experimental + - name: upload experimental &name <<: *upload settings: target: /srv/fwuploads/troisdorf/multi/experimental From 4641648897f7327bf6c1d3b47470ab08efc133f7 Mon Sep 17 00:00:00 2001 From: Nils Jakobi Date: Fri, 21 Feb 2020 20:50:17 +0100 Subject: [PATCH 07/19] debugging anchors --- .drone.yml | 330 ++++++++++++++++++++++++++--------------------------- 1 file changed, 165 insertions(+), 165 deletions(-) diff --git a/.drone.yml b/.drone.yml index 57aaf63..f51f5e6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -32,168 +32,168 @@ name: gluon-build clone: depth: 50 -steps: -- name: submodules - image: docker:git - commands: - - git submodule update --recursive --init - -- name: change site to multi - image: docker:git - commands: - - cd site - - git checkout multidomain - -# - name: make update -# <<: *env -# commands: -# - cd gluon -# - make update -# environment: -# GLUON_TARGET: ar71xx-generic - -# - name: build-ath79-generic -# <<: *gluon -# environment: -# GLUON_TARGET: ath79-generic -# -# - name: build-ar71xx-generic -# <<: *gluon -# environment: -# GLUON_TARGET: ar71xx-generic -# -# - name: build-ar71xx-tiny -# <<: *gluon -# environment: -# GLUON_TARGET: ar71xx-tiny -# -# - name: build-ar71xx-nand -# <<: *gluon -# environment: -# GLUON_TARGET: ar71xx-nand -# -# - name: build-brcm2708-bcm2708 -# <<: *gluon -# environment: -# GLUON_TARGET: brcm2708-bcm2708 -# -# - name: build-brcm2708-bcm2709 -# <<: *gluon -# environment: -# GLUON_TARGET: brcm2708-bcm2709 -# -# - name: build-mpc85xx-generic -# <<: *gluon -# environment: -# GLUON_TARGET: mpc85xx-generic -# -# - name: build-mpc85xx-p1020 -# <<: *gluon -# environment: -# GLUON_TARGET: mpc85xx-p1020 -# -# - name: build-x86-generic -# <<: *gluon -# environment: -# GLUON_TARGET: x86-generic -# -# - name: build-x86-geode -# <<: *gluon -# environment: -# GLUON_TARGET: x86-geode -# -# - name: build-x86-64 -# <<: *gluon -# environment: -# GLUON_TARGET: x86-64 -# -# - name: build-ipq40xx-generic -# <<: *gluon -# environment: -# GLUON_TARGET: ipq40xx-generic -# -# - name: ipq806x-generic -# <<: *gluon -# environment: -# GLUON_TARGET: ipq806x-generic -# -# - name: build-ramips-mt7620 -# <<: *gluon -# environment: -# GLUON_TARGET: ramips-mt7620 -# -# - name: build-ramips-mt7621 -# <<: *gluon -# environment: -# GLUON_TARGET: ramips-mt7621 -# -# - name: build-ramips-mt76x8 -# <<: *gluon -# environment: -# GLUON_TARGET: ramips-mt76x8 -# -# - name: build-ramips-rt305x -# <<: *gluon -# environment: -# GLUON_TARGET: ramips-rt305x -# -# - name: lantiq-xway -# <<: *gluon -# environment: -# GLUON_TARGET: lantiq-xway -# -# - name: lantiq-xrx200 -# <<: *gluon -# environment: -# GLUON_TARGET: lantiq-xrx200 -# -# - name: make manifest -# commands: -# - cd gluon -# - make manifest GLUON_BRANCH=stable GLUON_OUTPUTDIR=output/stable GLUON_RELEASE=$input_version-stable -# - make manifest GLUON_BRANCH=beta GLUON_OUTPUTDIR=output/beta GLUON_RELEASE=$input_version-beta -# - make manifest GLUON_BRANCH=experimental GLUON_OUTPUTDIR=output/experimental GLUON_RELEASE=$input_version-exp -# -# - name: backup-old-firmware -# <<: *gluon -# image: appleboy/drone-ssh -# settings: -# host: 46.4.138.183 -# username: fwupload -# key: -# from_secret: ssh-update -# port: 22 -# command_timeout: 120m -# script: -# #- ./rsync-backup-multi.sh -# - rm -rf /srv/fwuploads/troisdorf/multi/* -# - mkdir /srv/fwuploads/troisdorf/multi/stable -# - mkdir /srv/fwuploads/troisdorf/multi/beta -# - mkdir /srv/fwuploads/troisdorf/multi/experimental -# when: -# branch: master -# -# - name: upload stable -# <<: *upload -# settings: -# target: /srv/fwuploads/troisdorf/multi/stable -# source: /drone/src/gluon/output/stable/images/* -# -# - name: upload beta -# <<: *upload -# settings: -# target: /srv/fwuploads/troisdorf/multi/beta -# source: /drone/src/gluon/output/beta/images/* -# - - name: upload experimental &name - <<: *upload - settings: - target: /srv/fwuploads/troisdorf/multi/experimental - source: /drone/src/gluon/output/experimental/images/* -# -# - name: slack -# image: plugins/slack -# settings: -# webhook: -# from_secret: slack_webhook -# channel: fftdf_firmware +steps: &steps + - name: submodules + image: docker:git + commands: + - git submodule update --recursive --init + + - name: change site to multi + image: docker:git + commands: + - cd site + - git checkout multidomain + + - name: make update + <<: *env + commands: + - cd gluon + - make update + environment: + GLUON_TARGET: ar71xx-generic + +# - name: build-ath79-generic +# <<: *gluon +# environment: +# GLUON_TARGET: ath79-generic +# +# - name: build-ar71xx-generic +# <<: *gluon +# environment: +# GLUON_TARGET: ar71xx-generic +# +# - name: build-ar71xx-tiny +# <<: *gluon +# environment: +# GLUON_TARGET: ar71xx-tiny +# +# - name: build-ar71xx-nand +# <<: *gluon +# environment: +# GLUON_TARGET: ar71xx-nand +# +# - name: build-brcm2708-bcm2708 +# <<: *gluon +# environment: +# GLUON_TARGET: brcm2708-bcm2708 +# +# - name: build-brcm2708-bcm2709 +# <<: *gluon +# environment: +# GLUON_TARGET: brcm2708-bcm2709 +# +# - name: build-mpc85xx-generic +# <<: *gluon +# environment: +# GLUON_TARGET: mpc85xx-generic +# +# - name: build-mpc85xx-p1020 +# <<: *gluon +# environment: +# GLUON_TARGET: mpc85xx-p1020 +# +# - name: build-x86-generic +# <<: *gluon +# environment: +# GLUON_TARGET: x86-generic +# +# - name: build-x86-geode +# <<: *gluon +# environment: +# GLUON_TARGET: x86-geode +# +# - name: build-x86-64 +# <<: *gluon +# environment: +# GLUON_TARGET: x86-64 +# +# - name: build-ipq40xx-generic +# <<: *gluon +# environment: +# GLUON_TARGET: ipq40xx-generic +# +# - name: ipq806x-generic +# <<: *gluon +# environment: +# GLUON_TARGET: ipq806x-generic +# +# - name: build-ramips-mt7620 +# <<: *gluon +# environment: +# GLUON_TARGET: ramips-mt7620 +# +# - name: build-ramips-mt7621 +# <<: *gluon +# environment: +# GLUON_TARGET: ramips-mt7621 +# +# - name: build-ramips-mt76x8 +# <<: *gluon +# environment: +# GLUON_TARGET: ramips-mt76x8 +# +# - name: build-ramips-rt305x +# <<: *gluon +# environment: +# GLUON_TARGET: ramips-rt305x +# +# - name: lantiq-xway +# <<: *gluon +# environment: +# GLUON_TARGET: lantiq-xway +# +# - name: lantiq-xrx200 +# <<: *gluon +# environment: +# GLUON_TARGET: lantiq-xrx200 +# +# - name: make manifest +# commands: +# - cd gluon +# - make manifest GLUON_BRANCH=stable GLUON_OUTPUTDIR=output/stable GLUON_RELEASE=$input_version-stable +# - make manifest GLUON_BRANCH=beta GLUON_OUTPUTDIR=output/beta GLUON_RELEASE=$input_version-beta +# - make manifest GLUON_BRANCH=experimental GLUON_OUTPUTDIR=output/experimental GLUON_RELEASE=$input_version-exp +# +# - name: backup-old-firmware +# <<: *gluon +# image: appleboy/drone-ssh +# settings: +# host: 46.4.138.183 +# username: fwupload +# key: +# from_secret: ssh-update +# port: 22 +# command_timeout: 120m +# script: +# #- ./rsync-backup-multi.sh +# - rm -rf /srv/fwuploads/troisdorf/multi/* +# - mkdir /srv/fwuploads/troisdorf/multi/stable +# - mkdir /srv/fwuploads/troisdorf/multi/beta +# - mkdir /srv/fwuploads/troisdorf/multi/experimental +# when: +# branch: master +# +# - name: upload stable +# <<: *upload +# settings: +# target: /srv/fwuploads/troisdorf/multi/stable +# source: /drone/src/gluon/output/stable/images/* +# +# - name: upload beta +# <<: *upload +# settings: +# target: /srv/fwuploads/troisdorf/multi/beta +# source: /drone/src/gluon/output/beta/images/* +# +# - name: upload experimental +# <<: *upload +# settings: +# target: /srv/fwuploads/troisdorf/multi/experimental +# source: /drone/src/gluon/output/experimental/images/* +# +# - name: slack +# image: plugins/slack +# settings: +# webhook: +# from_secret: slack_webhook +# channel: fftdf_firmware From 88eecb90bdf13ec7cc6d8ee7448b5cb2ba6c6d90 Mon Sep 17 00:00:00 2001 From: Nils Jakobi Date: Fri, 21 Feb 2020 20:57:44 +0100 Subject: [PATCH 08/19] testing conditionals --- .drone.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index f51f5e6..5da467a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -185,11 +185,11 @@ steps: &steps # target: /srv/fwuploads/troisdorf/multi/beta # source: /drone/src/gluon/output/beta/images/* # -# - name: upload experimental -# <<: *upload -# settings: -# target: /srv/fwuploads/troisdorf/multi/experimental -# source: /drone/src/gluon/output/experimental/images/* + - name: upload experimental + <<: *upload + settings: + target: /srv/fwuploads/troisdorf/multi/experimental + source: /drone/src/gluon/output/experimental/images/* # # - name: slack # image: plugins/slack From 5937c32e62f4766cee2e4fe5267c2c792ff1b2fd Mon Sep 17 00:00:00 2001 From: Nils Jakobi Date: Fri, 21 Feb 2020 20:59:21 +0100 Subject: [PATCH 09/19] re-enabled all other stuff --- .drone.yml | 280 ++++++++++++++++++++++++++--------------------------- 1 file changed, 140 insertions(+), 140 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5da467a..fbcf654 100644 --- a/.drone.yml +++ b/.drone.yml @@ -52,148 +52,148 @@ steps: &steps environment: GLUON_TARGET: ar71xx-generic -# - name: build-ath79-generic -# <<: *gluon -# environment: -# GLUON_TARGET: ath79-generic -# -# - name: build-ar71xx-generic -# <<: *gluon -# environment: -# GLUON_TARGET: ar71xx-generic -# -# - name: build-ar71xx-tiny -# <<: *gluon -# environment: -# GLUON_TARGET: ar71xx-tiny -# -# - name: build-ar71xx-nand -# <<: *gluon -# environment: -# GLUON_TARGET: ar71xx-nand -# -# - name: build-brcm2708-bcm2708 -# <<: *gluon -# environment: -# GLUON_TARGET: brcm2708-bcm2708 -# -# - name: build-brcm2708-bcm2709 -# <<: *gluon -# environment: -# GLUON_TARGET: brcm2708-bcm2709 -# -# - name: build-mpc85xx-generic -# <<: *gluon -# environment: -# GLUON_TARGET: mpc85xx-generic -# -# - name: build-mpc85xx-p1020 -# <<: *gluon -# environment: -# GLUON_TARGET: mpc85xx-p1020 -# -# - name: build-x86-generic -# <<: *gluon -# environment: -# GLUON_TARGET: x86-generic -# -# - name: build-x86-geode -# <<: *gluon -# environment: -# GLUON_TARGET: x86-geode -# -# - name: build-x86-64 -# <<: *gluon -# environment: -# GLUON_TARGET: x86-64 -# -# - name: build-ipq40xx-generic -# <<: *gluon -# environment: -# GLUON_TARGET: ipq40xx-generic -# -# - name: ipq806x-generic -# <<: *gluon -# environment: -# GLUON_TARGET: ipq806x-generic -# -# - name: build-ramips-mt7620 -# <<: *gluon -# environment: -# GLUON_TARGET: ramips-mt7620 -# -# - name: build-ramips-mt7621 -# <<: *gluon -# environment: -# GLUON_TARGET: ramips-mt7621 -# -# - name: build-ramips-mt76x8 -# <<: *gluon -# environment: -# GLUON_TARGET: ramips-mt76x8 -# -# - name: build-ramips-rt305x -# <<: *gluon -# environment: -# GLUON_TARGET: ramips-rt305x -# -# - name: lantiq-xway -# <<: *gluon -# environment: -# GLUON_TARGET: lantiq-xway -# -# - name: lantiq-xrx200 -# <<: *gluon -# environment: -# GLUON_TARGET: lantiq-xrx200 -# -# - name: make manifest -# commands: -# - cd gluon -# - make manifest GLUON_BRANCH=stable GLUON_OUTPUTDIR=output/stable GLUON_RELEASE=$input_version-stable -# - make manifest GLUON_BRANCH=beta GLUON_OUTPUTDIR=output/beta GLUON_RELEASE=$input_version-beta -# - make manifest GLUON_BRANCH=experimental GLUON_OUTPUTDIR=output/experimental GLUON_RELEASE=$input_version-exp -# -# - name: backup-old-firmware -# <<: *gluon -# image: appleboy/drone-ssh -# settings: -# host: 46.4.138.183 -# username: fwupload -# key: -# from_secret: ssh-update -# port: 22 -# command_timeout: 120m -# script: -# #- ./rsync-backup-multi.sh -# - rm -rf /srv/fwuploads/troisdorf/multi/* -# - mkdir /srv/fwuploads/troisdorf/multi/stable -# - mkdir /srv/fwuploads/troisdorf/multi/beta -# - mkdir /srv/fwuploads/troisdorf/multi/experimental -# when: -# branch: master -# -# - name: upload stable -# <<: *upload -# settings: -# target: /srv/fwuploads/troisdorf/multi/stable -# source: /drone/src/gluon/output/stable/images/* -# -# - name: upload beta -# <<: *upload -# settings: -# target: /srv/fwuploads/troisdorf/multi/beta -# source: /drone/src/gluon/output/beta/images/* -# + - name: build-ath79-generic + <<: *gluon + environment: + GLUON_TARGET: ath79-generic + + - name: build-ar71xx-generic + <<: *gluon + environment: + GLUON_TARGET: ar71xx-generic + + - name: build-ar71xx-tiny + <<: *gluon + environment: + GLUON_TARGET: ar71xx-tiny + + - name: build-ar71xx-nand + <<: *gluon + environment: + GLUON_TARGET: ar71xx-nand + + - name: build-brcm2708-bcm2708 + <<: *gluon + environment: + GLUON_TARGET: brcm2708-bcm2708 + + - name: build-brcm2708-bcm2709 + <<: *gluon + environment: + GLUON_TARGET: brcm2708-bcm2709 + + - name: build-mpc85xx-generic + <<: *gluon + environment: + GLUON_TARGET: mpc85xx-generic + + - name: build-mpc85xx-p1020 + <<: *gluon + environment: + GLUON_TARGET: mpc85xx-p1020 + + - name: build-x86-generic + <<: *gluon + environment: + GLUON_TARGET: x86-generic + + - name: build-x86-geode + <<: *gluon + environment: + GLUON_TARGET: x86-geode + + - name: build-x86-64 + <<: *gluon + environment: + GLUON_TARGET: x86-64 + + - name: build-ipq40xx-generic + <<: *gluon + environment: + GLUON_TARGET: ipq40xx-generic + + - name: ipq806x-generic + <<: *gluon + environment: + GLUON_TARGET: ipq806x-generic + + - name: build-ramips-mt7620 + <<: *gluon + environment: + GLUON_TARGET: ramips-mt7620 + + - name: build-ramips-mt7621 + <<: *gluon + environment: + GLUON_TARGET: ramips-mt7621 + + - name: build-ramips-mt76x8 + <<: *gluon + environment: + GLUON_TARGET: ramips-mt76x8 + + - name: build-ramips-rt305x + <<: *gluon + environment: + GLUON_TARGET: ramips-rt305x + + - name: lantiq-xway + <<: *gluon + environment: + GLUON_TARGET: lantiq-xway + + - name: lantiq-xrx200 + <<: *gluon + environment: + GLUON_TARGET: lantiq-xrx200 + + - name: make manifest + commands: + - cd gluon + - make manifest GLUON_BRANCH=stable GLUON_OUTPUTDIR=output/stable GLUON_RELEASE=$input_version-stable + - make manifest GLUON_BRANCH=beta GLUON_OUTPUTDIR=output/beta GLUON_RELEASE=$input_version-beta + - make manifest GLUON_BRANCH=experimental GLUON_OUTPUTDIR=output/experimental GLUON_RELEASE=$input_version-exp + + - name: backup-old-firmware + <<: *gluon + image: appleboy/drone-ssh + settings: + host: 46.4.138.183 + username: fwupload + key: + from_secret: ssh-update + port: 22 + command_timeout: 120m + script: + #- ./rsync-backup-multi.sh + - rm -rf /srv/fwuploads/troisdorf/multi/* + - mkdir /srv/fwuploads/troisdorf/multi/stable + - mkdir /srv/fwuploads/troisdorf/multi/beta + - mkdir /srv/fwuploads/troisdorf/multi/experimental + when: + branch: master + + - name: upload stable + <<: *upload + settings: + target: /srv/fwuploads/troisdorf/multi/stable + source: /drone/src/gluon/output/stable/images/* + + - name: upload beta + <<: *upload + settings: + target: /srv/fwuploads/troisdorf/multi/beta + source: /drone/src/gluon/output/beta/images/* + - name: upload experimental <<: *upload settings: target: /srv/fwuploads/troisdorf/multi/experimental source: /drone/src/gluon/output/experimental/images/* -# -# - name: slack -# image: plugins/slack -# settings: -# webhook: -# from_secret: slack_webhook -# channel: fftdf_firmware + + - name: slack + image: plugins/slack + settings: + webhook: + from_secret: slack_webhook + channel: fftdf_firmware From a1a4f305915b59fd537538837b3c4e920e81f33d Mon Sep 17 00:00:00 2001 From: Nils Jakobi Date: Fri, 21 Feb 2020 21:01:10 +0100 Subject: [PATCH 10/19] fixed an anchor --- .drone.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index fbcf654..6d491e5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -155,7 +155,6 @@ steps: &steps - make manifest GLUON_BRANCH=experimental GLUON_OUTPUTDIR=output/experimental GLUON_RELEASE=$input_version-exp - name: backup-old-firmware - <<: *gluon image: appleboy/drone-ssh settings: host: 46.4.138.183 From 77f94698257a18bb35955bbd048783dff008685e Mon Sep 17 00:00:00 2001 From: Nils Jakobi Date: Fri, 21 Feb 2020 21:02:21 +0100 Subject: [PATCH 11/19] ... more fixing? --- .drone.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.drone.yml b/.drone.yml index 6d491e5..e64d98b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -154,23 +154,23 @@ steps: &steps - make manifest GLUON_BRANCH=beta GLUON_OUTPUTDIR=output/beta GLUON_RELEASE=$input_version-beta - make manifest GLUON_BRANCH=experimental GLUON_OUTPUTDIR=output/experimental GLUON_RELEASE=$input_version-exp - - name: backup-old-firmware - image: appleboy/drone-ssh - settings: - host: 46.4.138.183 - username: fwupload - key: - from_secret: ssh-update - port: 22 - command_timeout: 120m - script: - #- ./rsync-backup-multi.sh - - rm -rf /srv/fwuploads/troisdorf/multi/* - - mkdir /srv/fwuploads/troisdorf/multi/stable - - mkdir /srv/fwuploads/troisdorf/multi/beta - - mkdir /srv/fwuploads/troisdorf/multi/experimental - when: - branch: master +# - name: backup-old-firmware +# image: appleboy/drone-ssh +# settings: +# host: 46.4.138.183 +# username: fwupload +# key: +# from_secret: ssh-update +# port: 22 +# command_timeout: 120m +# script: +# #- ./rsync-backup-multi.sh +# - rm -rf /srv/fwuploads/troisdorf/multi/* +# - mkdir /srv/fwuploads/troisdorf/multi/stable +# - mkdir /srv/fwuploads/troisdorf/multi/beta +# - mkdir /srv/fwuploads/troisdorf/multi/experimental +# when: +# branch: master - name: upload stable <<: *upload From 9adb507643dbb7f430a505001bad8613d19a8d71 Mon Sep 17 00:00:00 2001 From: Nils Jakobi Date: Fri, 21 Feb 2020 21:03:05 +0100 Subject: [PATCH 12/19] ... --- .drone.yml | 276 ++++++++++++++++++++++++++--------------------------- 1 file changed, 138 insertions(+), 138 deletions(-) diff --git a/.drone.yml b/.drone.yml index e64d98b..1082c3f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -57,142 +57,142 @@ steps: &steps environment: GLUON_TARGET: ath79-generic - - name: build-ar71xx-generic - <<: *gluon - environment: - GLUON_TARGET: ar71xx-generic - - - name: build-ar71xx-tiny - <<: *gluon - environment: - GLUON_TARGET: ar71xx-tiny - - - name: build-ar71xx-nand - <<: *gluon - environment: - GLUON_TARGET: ar71xx-nand - - - name: build-brcm2708-bcm2708 - <<: *gluon - environment: - GLUON_TARGET: brcm2708-bcm2708 - - - name: build-brcm2708-bcm2709 - <<: *gluon - environment: - GLUON_TARGET: brcm2708-bcm2709 - - - name: build-mpc85xx-generic - <<: *gluon - environment: - GLUON_TARGET: mpc85xx-generic - - - name: build-mpc85xx-p1020 - <<: *gluon - environment: - GLUON_TARGET: mpc85xx-p1020 - - - name: build-x86-generic - <<: *gluon - environment: - GLUON_TARGET: x86-generic - - - name: build-x86-geode - <<: *gluon - environment: - GLUON_TARGET: x86-geode - - - name: build-x86-64 - <<: *gluon - environment: - GLUON_TARGET: x86-64 - - - name: build-ipq40xx-generic - <<: *gluon - environment: - GLUON_TARGET: ipq40xx-generic - - - name: ipq806x-generic - <<: *gluon - environment: - GLUON_TARGET: ipq806x-generic - - - name: build-ramips-mt7620 - <<: *gluon - environment: - GLUON_TARGET: ramips-mt7620 - - - name: build-ramips-mt7621 - <<: *gluon - environment: - GLUON_TARGET: ramips-mt7621 - - - name: build-ramips-mt76x8 - <<: *gluon - environment: - GLUON_TARGET: ramips-mt76x8 - - - name: build-ramips-rt305x - <<: *gluon - environment: - GLUON_TARGET: ramips-rt305x - - - name: lantiq-xway - <<: *gluon - environment: - GLUON_TARGET: lantiq-xway - - - name: lantiq-xrx200 - <<: *gluon - environment: - GLUON_TARGET: lantiq-xrx200 - - - name: make manifest - commands: - - cd gluon - - make manifest GLUON_BRANCH=stable GLUON_OUTPUTDIR=output/stable GLUON_RELEASE=$input_version-stable - - make manifest GLUON_BRANCH=beta GLUON_OUTPUTDIR=output/beta GLUON_RELEASE=$input_version-beta - - make manifest GLUON_BRANCH=experimental GLUON_OUTPUTDIR=output/experimental GLUON_RELEASE=$input_version-exp - -# - name: backup-old-firmware -# image: appleboy/drone-ssh +# - name: build-ar71xx-generic +# <<: *gluon +# environment: +# GLUON_TARGET: ar71xx-generic +# +# - name: build-ar71xx-tiny +# <<: *gluon +# environment: +# GLUON_TARGET: ar71xx-tiny +# +# - name: build-ar71xx-nand +# <<: *gluon +# environment: +# GLUON_TARGET: ar71xx-nand +# +# - name: build-brcm2708-bcm2708 +# <<: *gluon +# environment: +# GLUON_TARGET: brcm2708-bcm2708 +# +# - name: build-brcm2708-bcm2709 +# <<: *gluon +# environment: +# GLUON_TARGET: brcm2708-bcm2709 +# +# - name: build-mpc85xx-generic +# <<: *gluon +# environment: +# GLUON_TARGET: mpc85xx-generic +# +# - name: build-mpc85xx-p1020 +# <<: *gluon +# environment: +# GLUON_TARGET: mpc85xx-p1020 +# +# - name: build-x86-generic +# <<: *gluon +# environment: +# GLUON_TARGET: x86-generic +# +# - name: build-x86-geode +# <<: *gluon +# environment: +# GLUON_TARGET: x86-geode +# +# - name: build-x86-64 +# <<: *gluon +# environment: +# GLUON_TARGET: x86-64 +# +# - name: build-ipq40xx-generic +# <<: *gluon +# environment: +# GLUON_TARGET: ipq40xx-generic +# +# - name: ipq806x-generic +# <<: *gluon +# environment: +# GLUON_TARGET: ipq806x-generic +# +# - name: build-ramips-mt7620 +# <<: *gluon +# environment: +# GLUON_TARGET: ramips-mt7620 +# +# - name: build-ramips-mt7621 +# <<: *gluon +# environment: +# GLUON_TARGET: ramips-mt7621 +# +# - name: build-ramips-mt76x8 +# <<: *gluon +# environment: +# GLUON_TARGET: ramips-mt76x8 +# +# - name: build-ramips-rt305x +# <<: *gluon +# environment: +# GLUON_TARGET: ramips-rt305x +# +# - name: lantiq-xway +# <<: *gluon +# environment: +# GLUON_TARGET: lantiq-xway +# +# - name: lantiq-xrx200 +# <<: *gluon +# environment: +# GLUON_TARGET: lantiq-xrx200 +# +# - name: make manifest +# commands: +# - cd gluon +# - make manifest GLUON_BRANCH=stable GLUON_OUTPUTDIR=output/stable GLUON_RELEASE=$input_version-stable +# - make manifest GLUON_BRANCH=beta GLUON_OUTPUTDIR=output/beta GLUON_RELEASE=$input_version-beta +# - make manifest GLUON_BRANCH=experimental GLUON_OUTPUTDIR=output/experimental GLUON_RELEASE=$input_version-exp +# +## - name: backup-old-firmware +## image: appleboy/drone-ssh +## settings: +## host: 46.4.138.183 +## username: fwupload +## key: +## from_secret: ssh-update +## port: 22 +## command_timeout: 120m +## script: +## #- ./rsync-backup-multi.sh +## - rm -rf /srv/fwuploads/troisdorf/multi/* +## - mkdir /srv/fwuploads/troisdorf/multi/stable +## - mkdir /srv/fwuploads/troisdorf/multi/beta +## - mkdir /srv/fwuploads/troisdorf/multi/experimental +## when: +## branch: master +# +# - name: upload stable +# <<: *upload # settings: -# host: 46.4.138.183 -# username: fwupload -# key: -# from_secret: ssh-update -# port: 22 -# command_timeout: 120m -# script: -# #- ./rsync-backup-multi.sh -# - rm -rf /srv/fwuploads/troisdorf/multi/* -# - mkdir /srv/fwuploads/troisdorf/multi/stable -# - mkdir /srv/fwuploads/troisdorf/multi/beta -# - mkdir /srv/fwuploads/troisdorf/multi/experimental -# when: -# branch: master - - - name: upload stable - <<: *upload - settings: - target: /srv/fwuploads/troisdorf/multi/stable - source: /drone/src/gluon/output/stable/images/* - - - name: upload beta - <<: *upload - settings: - target: /srv/fwuploads/troisdorf/multi/beta - source: /drone/src/gluon/output/beta/images/* - - - name: upload experimental - <<: *upload - settings: - target: /srv/fwuploads/troisdorf/multi/experimental - source: /drone/src/gluon/output/experimental/images/* - - - name: slack - image: plugins/slack - settings: - webhook: - from_secret: slack_webhook - channel: fftdf_firmware +# target: /srv/fwuploads/troisdorf/multi/stable +# source: /drone/src/gluon/output/stable/images/* +# +# - name: upload beta +# <<: *upload +# settings: +# target: /srv/fwuploads/troisdorf/multi/beta +# source: /drone/src/gluon/output/beta/images/* +# +# - name: upload experimental +# <<: *upload +# settings: +# target: /srv/fwuploads/troisdorf/multi/experimental +# source: /drone/src/gluon/output/experimental/images/* +# +# - name: slack +# image: plugins/slack +# settings: +# webhook: +# from_secret: slack_webhook +# channel: fftdf_firmware From 1c34af97a4c806858f53c32c72f577b3e76eb2a8 Mon Sep 17 00:00:00 2001 From: Nils Jakobi Date: Fri, 21 Feb 2020 21:20:13 +0100 Subject: [PATCH 13/19] fixed whitespace --- .drone.yml | 62 +++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1082c3f..0001877 100644 --- a/.drone.yml +++ b/.drone.yml @@ -37,13 +37,13 @@ steps: &steps image: docker:git commands: - git submodule update --recursive --init - + - name: change site to multi image: docker:git commands: - cd site - git checkout multidomain - + - name: make update <<: *env commands: @@ -51,109 +51,109 @@ steps: &steps - make update environment: GLUON_TARGET: ar71xx-generic - + - name: build-ath79-generic <<: *gluon environment: GLUON_TARGET: ath79-generic - -# - name: build-ar71xx-generic -# <<: *gluon -# environment: -# GLUON_TARGET: ar71xx-generic -# + + - name: build-ar71xx-generic + <<: *gluon + environment: + GLUON_TARGET: ar71xx-generic + # - name: build-ar71xx-tiny # <<: *gluon # environment: # GLUON_TARGET: ar71xx-tiny -# +# # - name: build-ar71xx-nand # <<: *gluon # environment: # GLUON_TARGET: ar71xx-nand -# +# # - name: build-brcm2708-bcm2708 # <<: *gluon # environment: # GLUON_TARGET: brcm2708-bcm2708 -# +# # - name: build-brcm2708-bcm2709 # <<: *gluon # environment: # GLUON_TARGET: brcm2708-bcm2709 -# +# # - name: build-mpc85xx-generic # <<: *gluon # environment: # GLUON_TARGET: mpc85xx-generic -# +# # - name: build-mpc85xx-p1020 # <<: *gluon # environment: # GLUON_TARGET: mpc85xx-p1020 -# +# # - name: build-x86-generic # <<: *gluon # environment: # GLUON_TARGET: x86-generic -# +# # - name: build-x86-geode # <<: *gluon # environment: # GLUON_TARGET: x86-geode -# +# # - name: build-x86-64 # <<: *gluon # environment: # GLUON_TARGET: x86-64 -# +# # - name: build-ipq40xx-generic # <<: *gluon # environment: # GLUON_TARGET: ipq40xx-generic -# +# # - name: ipq806x-generic # <<: *gluon # environment: # GLUON_TARGET: ipq806x-generic -# +# # - name: build-ramips-mt7620 # <<: *gluon # environment: # GLUON_TARGET: ramips-mt7620 -# +# # - name: build-ramips-mt7621 # <<: *gluon # environment: # GLUON_TARGET: ramips-mt7621 -# +# # - name: build-ramips-mt76x8 # <<: *gluon # environment: # GLUON_TARGET: ramips-mt76x8 -# +# # - name: build-ramips-rt305x # <<: *gluon # environment: # GLUON_TARGET: ramips-rt305x -# +# # - name: lantiq-xway # <<: *gluon # environment: # GLUON_TARGET: lantiq-xway -# +# # - name: lantiq-xrx200 # <<: *gluon # environment: # GLUON_TARGET: lantiq-xrx200 -# +# # - name: make manifest # commands: # - cd gluon # - make manifest GLUON_BRANCH=stable GLUON_OUTPUTDIR=output/stable GLUON_RELEASE=$input_version-stable # - make manifest GLUON_BRANCH=beta GLUON_OUTPUTDIR=output/beta GLUON_RELEASE=$input_version-beta # - make manifest GLUON_BRANCH=experimental GLUON_OUTPUTDIR=output/experimental GLUON_RELEASE=$input_version-exp -# +# ## - name: backup-old-firmware ## image: appleboy/drone-ssh ## settings: @@ -171,25 +171,25 @@ steps: &steps ## - mkdir /srv/fwuploads/troisdorf/multi/experimental ## when: ## branch: master -# +# # - name: upload stable # <<: *upload # settings: # target: /srv/fwuploads/troisdorf/multi/stable # source: /drone/src/gluon/output/stable/images/* -# +# # - name: upload beta # <<: *upload # settings: # target: /srv/fwuploads/troisdorf/multi/beta # source: /drone/src/gluon/output/beta/images/* -# +# # - name: upload experimental # <<: *upload # settings: # target: /srv/fwuploads/troisdorf/multi/experimental # source: /drone/src/gluon/output/experimental/images/* -# +# # - name: slack # image: plugins/slack # settings: From afb4c433ad7b2ba4b1c8fd62fc892cc399903403 Mon Sep 17 00:00:00 2001 From: Nils Jakobi Date: Fri, 21 Feb 2020 21:21:03 +0100 Subject: [PATCH 14/19] reenable all build jobs --- .drone.yml | 170 ++++++++++++++++++++++++++--------------------------- 1 file changed, 85 insertions(+), 85 deletions(-) diff --git a/.drone.yml b/.drone.yml index 0001877..5ec7b14 100644 --- a/.drone.yml +++ b/.drone.yml @@ -62,91 +62,91 @@ steps: &steps environment: GLUON_TARGET: ar71xx-generic -# - name: build-ar71xx-tiny -# <<: *gluon -# environment: -# GLUON_TARGET: ar71xx-tiny -# -# - name: build-ar71xx-nand -# <<: *gluon -# environment: -# GLUON_TARGET: ar71xx-nand -# -# - name: build-brcm2708-bcm2708 -# <<: *gluon -# environment: -# GLUON_TARGET: brcm2708-bcm2708 -# -# - name: build-brcm2708-bcm2709 -# <<: *gluon -# environment: -# GLUON_TARGET: brcm2708-bcm2709 -# -# - name: build-mpc85xx-generic -# <<: *gluon -# environment: -# GLUON_TARGET: mpc85xx-generic -# -# - name: build-mpc85xx-p1020 -# <<: *gluon -# environment: -# GLUON_TARGET: mpc85xx-p1020 -# -# - name: build-x86-generic -# <<: *gluon -# environment: -# GLUON_TARGET: x86-generic -# -# - name: build-x86-geode -# <<: *gluon -# environment: -# GLUON_TARGET: x86-geode -# -# - name: build-x86-64 -# <<: *gluon -# environment: -# GLUON_TARGET: x86-64 -# -# - name: build-ipq40xx-generic -# <<: *gluon -# environment: -# GLUON_TARGET: ipq40xx-generic -# -# - name: ipq806x-generic -# <<: *gluon -# environment: -# GLUON_TARGET: ipq806x-generic -# -# - name: build-ramips-mt7620 -# <<: *gluon -# environment: -# GLUON_TARGET: ramips-mt7620 -# -# - name: build-ramips-mt7621 -# <<: *gluon -# environment: -# GLUON_TARGET: ramips-mt7621 -# -# - name: build-ramips-mt76x8 -# <<: *gluon -# environment: -# GLUON_TARGET: ramips-mt76x8 -# -# - name: build-ramips-rt305x -# <<: *gluon -# environment: -# GLUON_TARGET: ramips-rt305x -# -# - name: lantiq-xway -# <<: *gluon -# environment: -# GLUON_TARGET: lantiq-xway -# -# - name: lantiq-xrx200 -# <<: *gluon -# environment: -# GLUON_TARGET: lantiq-xrx200 -# + - name: build-ar71xx-tiny + <<: *gluon + environment: + GLUON_TARGET: ar71xx-tiny + + - name: build-ar71xx-nand + <<: *gluon + environment: + GLUON_TARGET: ar71xx-nand + + - name: build-brcm2708-bcm2708 + <<: *gluon + environment: + GLUON_TARGET: brcm2708-bcm2708 + + - name: build-brcm2708-bcm2709 + <<: *gluon + environment: + GLUON_TARGET: brcm2708-bcm2709 + + - name: build-mpc85xx-generic + <<: *gluon + environment: + GLUON_TARGET: mpc85xx-generic + + - name: build-mpc85xx-p1020 + <<: *gluon + environment: + GLUON_TARGET: mpc85xx-p1020 + + - name: build-x86-generic + <<: *gluon + environment: + GLUON_TARGET: x86-generic + + - name: build-x86-geode + <<: *gluon + environment: + GLUON_TARGET: x86-geode + + - name: build-x86-64 + <<: *gluon + environment: + GLUON_TARGET: x86-64 + + - name: build-ipq40xx-generic + <<: *gluon + environment: + GLUON_TARGET: ipq40xx-generic + + - name: ipq806x-generic + <<: *gluon + environment: + GLUON_TARGET: ipq806x-generic + + - name: build-ramips-mt7620 + <<: *gluon + environment: + GLUON_TARGET: ramips-mt7620 + + - name: build-ramips-mt7621 + <<: *gluon + environment: + GLUON_TARGET: ramips-mt7621 + + - name: build-ramips-mt76x8 + <<: *gluon + environment: + GLUON_TARGET: ramips-mt76x8 + + - name: build-ramips-rt305x + <<: *gluon + environment: + GLUON_TARGET: ramips-rt305x + + - name: lantiq-xway + <<: *gluon + environment: + GLUON_TARGET: lantiq-xway + + - name: lantiq-xrx200 + <<: *gluon + environment: + GLUON_TARGET: lantiq-xrx200 + # - name: make manifest # commands: # - cd gluon From 68accc48fce8b3fcca7a8d1c5cedb9d57c8a03f5 Mon Sep 17 00:00:00 2001 From: Nils Jakobi Date: Fri, 21 Feb 2020 21:24:42 +0100 Subject: [PATCH 15/19] enable uploads --- .drone.yml | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5ec7b14..3f47423 100644 --- a/.drone.yml +++ b/.drone.yml @@ -172,27 +172,27 @@ steps: &steps ## when: ## branch: master # -# - name: upload stable -# <<: *upload -# settings: -# target: /srv/fwuploads/troisdorf/multi/stable -# source: /drone/src/gluon/output/stable/images/* -# -# - name: upload beta -# <<: *upload -# settings: -# target: /srv/fwuploads/troisdorf/multi/beta -# source: /drone/src/gluon/output/beta/images/* -# -# - name: upload experimental -# <<: *upload -# settings: -# target: /srv/fwuploads/troisdorf/multi/experimental -# source: /drone/src/gluon/output/experimental/images/* -# -# - name: slack -# image: plugins/slack -# settings: -# webhook: -# from_secret: slack_webhook -# channel: fftdf_firmware + - name: upload stable + <<: *upload + settings: + target: /srv/fwuploads/troisdorf/multi/stable + source: /drone/src/gluon/output/stable/images/* + + - name: upload beta + <<: *upload + settings: + target: /srv/fwuploads/troisdorf/multi/beta + source: /drone/src/gluon/output/beta/images/* + + - name: upload experimental + <<: *upload + settings: + target: /srv/fwuploads/troisdorf/multi/experimental + source: /drone/src/gluon/output/experimental/images/* + + - name: slack + image: plugins/slack + settings: + webhook: + from_secret: slack_webhook + channel: fftdf_firmware From 4a4ff673e6acb204c22d7ba5d061335bb9aec919 Mon Sep 17 00:00:00 2001 From: Nils Jakobi Date: Fri, 21 Feb 2020 21:29:46 +0100 Subject: [PATCH 16/19] fixed whitespace that was causing errors --- .drone.yml | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/.drone.yml b/.drone.yml index 3f47423..a131f92 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,6 +15,8 @@ global-variables: - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental upload: &upload + when: + branch: master image: appleboy/drone-scp settings: host: 46.4.138.183 @@ -22,8 +24,6 @@ global-variables: key: from_secret: ssh-update strip_components: 6 - when: - branch: master kind: pipeline type: docker @@ -147,31 +147,31 @@ steps: &steps environment: GLUON_TARGET: lantiq-xrx200 -# - name: make manifest -# commands: -# - cd gluon -# - make manifest GLUON_BRANCH=stable GLUON_OUTPUTDIR=output/stable GLUON_RELEASE=$input_version-stable -# - make manifest GLUON_BRANCH=beta GLUON_OUTPUTDIR=output/beta GLUON_RELEASE=$input_version-beta -# - make manifest GLUON_BRANCH=experimental GLUON_OUTPUTDIR=output/experimental GLUON_RELEASE=$input_version-exp -# -## - name: backup-old-firmware -## image: appleboy/drone-ssh -## settings: -## host: 46.4.138.183 -## username: fwupload -## key: -## from_secret: ssh-update -## port: 22 -## command_timeout: 120m -## script: -## #- ./rsync-backup-multi.sh -## - rm -rf /srv/fwuploads/troisdorf/multi/* -## - mkdir /srv/fwuploads/troisdorf/multi/stable -## - mkdir /srv/fwuploads/troisdorf/multi/beta -## - mkdir /srv/fwuploads/troisdorf/multi/experimental -## when: -## branch: master -# + - name: make manifest + commands: + - cd gluon + - make manifest GLUON_BRANCH=stable GLUON_OUTPUTDIR=output/stable GLUON_RELEASE=$input_version-stable + - make manifest GLUON_BRANCH=beta GLUON_OUTPUTDIR=output/beta GLUON_RELEASE=$input_version-beta + - make manifest GLUON_BRANCH=experimental GLUON_OUTPUTDIR=output/experimental GLUON_RELEASE=$input_version-exp + + - name: backup-old-firmware + when: + branch: master + image: appleboy/drone-ssh + settings: + host: 46.4.138.183 + username: fwupload + key: + from_secret: ssh-update + port: 22 + command_timeout: 120m + script: + #- ./rsync-backup-multi.sh + - rm -rf /srv/fwuploads/troisdorf/multi/* + - mkdir /srv/fwuploads/troisdorf/multi/stable + - mkdir /srv/fwuploads/troisdorf/multi/beta + - mkdir /srv/fwuploads/troisdorf/multi/experimental + - name: upload stable <<: *upload settings: From 0a0f420f5ef198b491c85bea9e6c63980facd19c Mon Sep 17 00:00:00 2001 From: Nils Jakobi Date: Fri, 21 Feb 2020 21:36:49 +0100 Subject: [PATCH 17/19] drone doesn't like the order --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index a131f92..a1437fc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,8 +15,6 @@ global-variables: - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental upload: &upload - when: - branch: master image: appleboy/drone-scp settings: host: 46.4.138.183 @@ -24,6 +22,8 @@ global-variables: key: from_secret: ssh-update strip_components: 6 + when: + branch: master kind: pipeline type: docker @@ -155,8 +155,6 @@ steps: &steps - make manifest GLUON_BRANCH=experimental GLUON_OUTPUTDIR=output/experimental GLUON_RELEASE=$input_version-exp - name: backup-old-firmware - when: - branch: master image: appleboy/drone-ssh settings: host: 46.4.138.183 @@ -171,6 +169,8 @@ steps: &steps - mkdir /srv/fwuploads/troisdorf/multi/stable - mkdir /srv/fwuploads/troisdorf/multi/beta - mkdir /srv/fwuploads/troisdorf/multi/experimental + when: + branch: master - name: upload stable <<: *upload From aa75b902c7940417a855b59b71f059c21273d9e3 Mon Sep 17 00:00:00 2001 From: Nils Jakobi Date: Fri, 21 Feb 2020 21:37:48 +0100 Subject: [PATCH 18/19] ... --- .drone.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.drone.yml b/.drone.yml index a1437fc..a5b77dd 100644 --- a/.drone.yml +++ b/.drone.yml @@ -154,23 +154,23 @@ steps: &steps - make manifest GLUON_BRANCH=beta GLUON_OUTPUTDIR=output/beta GLUON_RELEASE=$input_version-beta - make manifest GLUON_BRANCH=experimental GLUON_OUTPUTDIR=output/experimental GLUON_RELEASE=$input_version-exp - - name: backup-old-firmware - image: appleboy/drone-ssh - settings: - host: 46.4.138.183 - username: fwupload - key: - from_secret: ssh-update - port: 22 - command_timeout: 120m - script: - #- ./rsync-backup-multi.sh - - rm -rf /srv/fwuploads/troisdorf/multi/* - - mkdir /srv/fwuploads/troisdorf/multi/stable - - mkdir /srv/fwuploads/troisdorf/multi/beta - - mkdir /srv/fwuploads/troisdorf/multi/experimental - when: - branch: master +# - name: backup-old-firmware +# image: appleboy/drone-ssh +# settings: +# host: 46.4.138.183 +# username: fwupload +# key: +# from_secret: ssh-update +# port: 22 +# command_timeout: 120m +# script: +# #- ./rsync-backup-multi.sh +# - rm -rf /srv/fwuploads/troisdorf/multi/* +# - mkdir /srv/fwuploads/troisdorf/multi/stable +# - mkdir /srv/fwuploads/troisdorf/multi/beta +# - mkdir /srv/fwuploads/troisdorf/multi/experimental +# when: +# branch: master - name: upload stable <<: *upload From 5fec7cf8236271bd980d408e80f181fde871010a Mon Sep 17 00:00:00 2001 From: Nils Jakobi Date: Fri, 21 Feb 2020 21:39:39 +0100 Subject: [PATCH 19/19] was missing an anchor --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index a5b77dd..1cd6452 100644 --- a/.drone.yml +++ b/.drone.yml @@ -148,6 +148,7 @@ steps: &steps GLUON_TARGET: lantiq-xrx200 - name: make manifest + <<: *env commands: - cd gluon - make manifest GLUON_BRANCH=stable GLUON_OUTPUTDIR=output/stable GLUON_RELEASE=$input_version-stable