From bc76eea0b1264982575ee9a2f2cac04f8b64eb6e Mon Sep 17 00:00:00 2001 From: Nils Stinnesbeck Date: Mon, 5 Jun 2023 20:38:19 +0200 Subject: [PATCH] more stuff --- .woodpecker/build.yml | 17 +---------------- .woodpecker/next.yml | 18 +----------------- .woodpecker/prepare.yml | 22 ---------------------- .woodpecker/prepare_next.yml | 20 -------------------- 4 files changed, 2 insertions(+), 75 deletions(-) delete mode 100644 .woodpecker/prepare.yml delete mode 100644 .woodpecker/prepare_next.yml diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml index 2f02928..86689e1 100644 --- a/.woodpecker/build.yml +++ b/.woodpecker/build.yml @@ -1,6 +1,4 @@ --- -platform: linux/arm64 - variables: - &default image: "git.freifunk-rhein-sieg.net/freifunk-troisdorf/docker-gluon-build:latest" @@ -39,19 +37,6 @@ pipeline: - cd gluon - make -j$(nproc) GLUON_AUTOUPDATER_BRANCH=${BRANCH} GLUON_AUTOUPDATER_ENABLED=1 GLUON_RELEASE=$input_version-${BRANCH} GLUON_OUTPUTDIR=output/${BRANCH} - upload: - image: appleboy/drone-scp - settings: - host: 46.4.138.183 - user: fwupload - key: - from_secret: ssh-key - strip_components: 2 - target: /srv/fwuploads-tmp/troisdorf/multi/ - source: gluon/output/${BRANCH}/* - when: - event: tag - matrix: TARGET: - ath79-generic @@ -83,4 +68,4 @@ matrix: - experimental depends_on: - - prepare \ No newline at end of file + - prepare diff --git a/.woodpecker/next.yml b/.woodpecker/next.yml index 06c5d2c..12ecfff 100644 --- a/.woodpecker/next.yml +++ b/.woodpecker/next.yml @@ -1,6 +1,4 @@ --- -platform: linux/arm64 - variables: - &default image: "git.freifunk-rhein-sieg.net/freifunk-troisdorf/docker-gluon-build:latest" @@ -52,23 +50,9 @@ pipeline: - echo "${TARGET}" > gluon/output/${CI_COMMIT_BRANCH}/images/factory/${TARGET} - ls -alh gluon/output/${CI_COMMIT_BRANCH}/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-tmp/troisdorf/testing/ - source: gluon/output/next/* - when: - event: push - branch: next - matrix: TARGET: - ramips-mt7621 depends_on: - - prepare_next \ No newline at end of file + - prepare_next diff --git a/.woodpecker/prepare.yml b/.woodpecker/prepare.yml deleted file mode 100644 index 552973f..0000000 --- a/.woodpecker/prepare.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -platform: linux/arm64 - -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-tmp/troisdorf/multi/* - - mkdir -p /srv/fwuploads-tmp/troisdorf/multi/stable - - mkdir -p /srv/fwuploads-tmp/troisdorf/multi/beta - - mkdir -p /srv/fwuploads-tmp/troisdorf/multi/experimental - when: - event: tag \ No newline at end of file diff --git a/.woodpecker/prepare_next.yml b/.woodpecker/prepare_next.yml deleted file mode 100644 index a5a207e..0000000 --- a/.woodpecker/prepare_next.yml +++ /dev/null @@ -1,20 +0,0 @@ ---- -platform: linux/arm64 - -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-tmp/troisdorf/testing/* - - mkdir -p /srv/fwuploads-tmp/troisdorf/testing/ - when: - branch: next \ No newline at end of file