From 24281ddf4970177877e4b0157605ebf24f4a709e Mon Sep 17 00:00:00 2001 From: Nils Stinnesbeck Date: Wed, 24 May 2023 07:13:12 +0200 Subject: [PATCH] fixed folder, also temporarily disabled all steps but cleanup, since this didn't run yet --- .woodpecker/build.yml | 168 ++++++++++++++++++++-------------------- .woodpecker/cleanup.yml | 2 +- .woodpecker/prepare.yml | 30 +++---- 3 files changed, 100 insertions(+), 100 deletions(-) diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml index 03d9c4a..c9de9ad 100644 --- a/.woodpecker/build.yml +++ b/.woodpecker/build.yml @@ -1,85 +1,85 @@ --- -variables: - - &default - image: "git.freifunk-rhein-sieg.net/freifunk-troisdorf/docker-gluon-build:latest" - pull: true - environment: - - input_version=v2022.1.4 - - GLUON_SITEDIR=../site - - 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 -j10 GLUON_AUTOUPDATER_BRANCH=stable GLUON_AUTOUPDATER_ENABLED=1 GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable - - list_images: - <<: *default - commands: - - mkdir -p gluon/output/stable/images/factory - - echo "${TARGET}" > gluon/output/stable/images/factory/${TARGET} - - ls -alh gluon/output/stable/images/factory - - upload: - image: appleboy/drone-scp - settings: - host: 46.4.138.183 - user: fwupload - key: - from_secret: ssh-key - strip_components: 2 - target: /srv/fwuploads-testing/troisdorf/multi/incoming/ - source: gluon/output/stable/* - -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 - -depends_on: - - prepare +#variables: +# - &default +# image: "git.freifunk-rhein-sieg.net/freifunk-troisdorf/docker-gluon-build:latest" +# pull: true +# environment: +# - input_version=v2022.1.4 +# - GLUON_SITEDIR=../site +# - 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 -j10 GLUON_AUTOUPDATER_BRANCH=stable GLUON_AUTOUPDATER_ENABLED=1 GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable +# +# list_images: +# <<: *default +# commands: +# - mkdir -p gluon/output/stable/images/factory +# - echo "${TARGET}" > gluon/output/stable/images/factory/${TARGET} +# - ls -alh gluon/output/stable/images/factory +# +# upload: +# image: appleboy/drone-scp +# settings: +# host: 46.4.138.183 +# user: fwupload +# key: +# from_secret: ssh-key +# strip_components: 2 +# target: /srv/fwuploads-testing/troisdorf/multi/incoming/ +# source: gluon/output/stable/* +# +#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 +# +#depends_on: +# - prepare diff --git a/.woodpecker/cleanup.yml b/.woodpecker/cleanup.yml index ac737aa..071262d 100644 --- a/.woodpecker/cleanup.yml +++ b/.woodpecker/cleanup.yml @@ -18,7 +18,7 @@ pipeline: - ls -alh /srv/fwuploads-testing/troisdorf/multi/incoming/stable - rm -rf /srv/fwuploads-testing/troisdorf/multi/stable/ - mkdir /srv/fwuploads-testing/troisdorf/multi/stable/ - - mv /srv/fwuploads-testing/troisdorf/mutli/incoming/stable/* /srv/fwuploads-testing/troisdorf/mutli/stable/ + - mv /srv/fwuploads-testing/troisdorf/multi/incoming/stable/* /srv/fwuploads-testing/troisdorf/multi/stable/ depends_on: - prepare diff --git a/.woodpecker/prepare.yml b/.woodpecker/prepare.yml index 7b4ffe1..9aaceb5 100644 --- a/.woodpecker/prepare.yml +++ b/.woodpecker/prepare.yml @@ -1,16 +1,16 @@ --- -skip_clone: true - -pipeline: - prepare: - image: appleboy/drone-ssh - settings: - host: 46.4.138.183 - username: fwupload - key: - from_secret: ssh-key - port: 22 - command_timeout: 120m - script: - - rm -rf /srv/fwuploads-testing/troisdorf/multi/incoming/stable - - mkdir -p /srv/fwuploads-testing/troisdorf/multi/incoming/stable +#skip_clone: true +# +#pipeline: +# prepare: +# image: appleboy/drone-ssh +# settings: +# host: 46.4.138.183 +# username: fwupload +# key: +# from_secret: ssh-key +# port: 22 +# command_timeout: 120m +# script: +# - rm -rf /srv/fwuploads-testing/troisdorf/multi/incoming/stable +# - mkdir -p /srv/fwuploads-testing/troisdorf/multi/incoming/stable