diff --git a/.drone.yml b/.drone.yml index 87c5d3a..2159fa8 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,7 +2,7 @@ global-variables: env: &env image: hoffmannhosting/gluon-builder environment: - input_version: v2020.1.2 + input_version: v2020.1.2-1 GLUON_SITEDIR: /drone/src/site FORCE_UNSAFE_CONFIGURE: 1 @@ -10,10 +10,7 @@ global-variables: <<: *env commands: - cd gluon - - make -j6 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable - - make -j6 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta -# Don´t build Experimental. The Experimental Firmware is in another Branch -# - make -j6 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental + - make -j6 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental upload: &upload image: appleboy/drone-scp @@ -24,7 +21,7 @@ global-variables: from_secret: ssh-update strip_components: 6 when: - branch: multidomain + branch: experimental kind: pipeline type: docker @@ -43,7 +40,7 @@ steps: &steps image: docker:git commands: - cd site - - git checkout multidomain + - git checkout multidomain-experimental - name: make update <<: *env @@ -152,10 +149,7 @@ steps: &steps <<: *env 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 -# Don´t build Experimental. The Experimental Firmware is in another Branch -# - make manifest GLUON_BRANCH=experimental GLUON_OUTPUTDIR=output/experimental GLUON_RELEASE=$input_version-exp + - make manifest GLUON_BRANCH=experimental GLUON_OUTPUTDIR=output/experimental GLUON_RELEASE=$input_version-exp - name: backup-old-firmware image: appleboy/drone-ssh @@ -168,31 +162,16 @@ steps: &steps command_timeout: 120m script: #- ./rsync-backup-multi.sh - - rm -rf /srv/fwuploads/troisdorf/multi/stable - - rm -rf /srv/fwuploads/troisdorf/multi/beta - - mkdir /srv/fwuploads/troisdorf/multi/stable - - mkdir /srv/fwuploads/troisdorf/multi/beta + - rm -rf /srv/fwuploads/troisdorf/multi/experimental + - mkdir /srv/fwuploads/troisdorf/multi/experimental when: - branch: multidomain + branch: experimental - - name: upload stable + - name: upload experimental <<: *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/* - -# Don´t build Experimental. The Experimental Firmware is in another Branch -# - name: upload experimental -# <<: *upload -# settings: -# target: /srv/fwuploads/troisdorf/multi/experimental -# source: /drone/src/gluon/output/experimental/images/* + target: /srv/fwuploads/troisdorf/multi/experimental + source: /drone/src/gluon/output/experimental/images/* - name: slack image: plugins/slack