removed branch from matrix, added targets, removed branch checkout for site
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed

This commit is contained in:
Nils Stinnesbeck 2023-05-23 00:54:42 +02:00
parent ddb1eab51a
commit 160c22ebb6
Signed by: nils
GPG Key ID: C52E07422A136076

View File

@ -8,8 +8,6 @@ variables:
- FORCE_UNSAFE_CONFIGURE=1 - FORCE_UNSAFE_CONFIGURE=1
- GLUON_TARGET=${TARGET} - GLUON_TARGET=${TARGET}
- GLUON_DEPRECATED=1 - GLUON_DEPRECATED=1
when:
hostname: c02.fftdf.de
workspace: workspace:
base: /build base: /build
@ -21,14 +19,6 @@ clone:
recursive: true recursive: true
pipeline: pipeline:
site-multidomain:
image: docker:git
commands:
- cd site
- git checkout 2022.x-multidomain
when:
hostname: c02.fftdf.de
make_update: make_update:
<<: *default <<: *default
commands: commands:
@ -44,7 +34,7 @@ pipeline:
<<: *default <<: *default
commands: commands:
- cd gluon - 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}: show-images-${TARGET}:
<<: *default <<: *default
@ -62,8 +52,8 @@ pipeline:
command_timeout: 120m command_timeout: 120m
script: script:
#- ./rsync-backup-multi.sh #- ./rsync-backup-multi.sh
- rm -rf /srv/fwuploads-testing/troisdorf/multi/${BRANCH}/ - rm -rf /srv/fwuploads-testing/troisdorf/multi/stable/
- mkdir /srv/fwuploads-testing/troisdorf/multi/${BRANCH}/ - mkdir /srv/fwuploads-testing/troisdorf/multi/stable/
upload: upload:
image: appleboy/drone-scp image: appleboy/drone-scp
@ -73,11 +63,28 @@ pipeline:
key: key:
from_secret: ssh-key from_secret: ssh-key
strip_components: 0 strip_components: 0
target: /srv/fwuploads-testing/troisdorf/multi/${BRANCH}/ target: /srv/fwuploads-testing/troisdorf/multi/stable/
source: gluon/output/${BRANCH}/* source: gluon/output/stable/*
matrix: matrix:
TARGET: TARGET:
- ar71xx-generic
- ar71xx-nand
- ar71xx-tiny
- ath79-generic - ath79-generic
BRANCH: - ath79-generic
- stable - 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