From 160c22ebb6dd81a45b9865e9ae6b26fbcf7aada4 Mon Sep 17 00:00:00 2001 From: Nils Stinnesbeck Date: Tue, 23 May 2023 00:54:42 +0200 Subject: [PATCH] removed branch from matrix, added targets, removed branch checkout for site --- .woodpecker.yml | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index d0328f0..9aba3dd 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -8,8 +8,6 @@ variables: - FORCE_UNSAFE_CONFIGURE=1 - GLUON_TARGET=${TARGET} - GLUON_DEPRECATED=1 - when: - hostname: c02.fftdf.de workspace: base: /build @@ -21,14 +19,6 @@ clone: recursive: true pipeline: - site-multidomain: - image: docker:git - commands: - - cd site - - git checkout 2022.x-multidomain - when: - hostname: c02.fftdf.de - make_update: <<: *default commands: @@ -44,7 +34,7 @@ pipeline: <<: *default commands: - cd gluon - - make -j10 GLUON_AUTOUPDATER_BRANCH=${BRANCH} GLUON_AUTOUPDATER_ENABLED=1 GLUON_RELEASE=$input_version-${BRANCH} GLUON_OUTPUTDIR=output/${BRANCH} + - make -j10 GLUON_AUTOUPDATER_BRANCH=stable GLUON_AUTOUPDATER_ENABLED=1 GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable show-images-${TARGET}: <<: *default @@ -62,8 +52,8 @@ pipeline: command_timeout: 120m script: #- ./rsync-backup-multi.sh - - rm -rf /srv/fwuploads-testing/troisdorf/multi/${BRANCH}/ - - mkdir /srv/fwuploads-testing/troisdorf/multi/${BRANCH}/ + - rm -rf /srv/fwuploads-testing/troisdorf/multi/stable/ + - mkdir /srv/fwuploads-testing/troisdorf/multi/stable/ upload: image: appleboy/drone-scp @@ -73,11 +63,28 @@ pipeline: key: from_secret: ssh-key strip_components: 0 - target: /srv/fwuploads-testing/troisdorf/multi/${BRANCH}/ - source: gluon/output/${BRANCH}/* + target: /srv/fwuploads-testing/troisdorf/multi/stable/ + source: gluon/output/stable/* matrix: TARGET: + - ar71xx-generic + - ar71xx-nand + - ar71xx-tiny - ath79-generic - BRANCH: - - stable + - ath79-generic + - brcm2708-bcm2708 + - brcm2708-bcm2709 + - ipq40xx-generic + - ipq806x-generic + - lantiq-xrx200 + - lantiq-xway + - mpc85xx-generic + - mpc85xx-p1020 + - ramips-mt7620 + - ramips-mt7621 + - ramips-mt76x8 + - ramips-rt305x + - x86-64 + - x86-generic + - x86-geode