From 3b104f069c27eae5a8cc16efc66ae5a8e27598c1 Mon Sep 17 00:00:00 2001 From: Stefan Date: Fri, 14 Jul 2023 20:21:20 +0200 Subject: [PATCH] testing beta and stable --- .woodpecker/build-stable.yml | 22 +++++++++++++++++----- .woodpecker/publish.yml | 10 +++++++--- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/.woodpecker/build-stable.yml b/.woodpecker/build-stable.yml index 7349fab..c7b109d 100644 --- a/.woodpecker/build-stable.yml +++ b/.woodpecker/build-stable.yml @@ -37,9 +37,10 @@ pipeline: <<: *default commands: - cd gluon - - make -j$(nproc) GLUON_AUTOUPDATER_BRANCH=${BRANCH} GLUON_AUTOUPDATER_ENABLED=1 GLUON_RELEASE=$input_version-${BRANCH} GLUON_OUTPUTDIR=output/${BRANCH} + - make -j$(nproc) GLUON_AUTOUPDATER_BRANCH=stable GLUON_AUTOUPDATER_ENABLED=1 GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable + - make -j$(nproc) GLUON_AUTOUPDATER_BRANCH=beta GLUON_AUTOUPDATER_ENABLED=1 GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta - upload: + upload-stable: image: appleboy/drone-scp settings: host: 46.4.138.183 @@ -48,7 +49,20 @@ pipeline: from_secret: ssh-key strip_components: 2 target: /srv/fwuploads-tmp/troisdorf/multi/ - source: gluon/output/${BRANCH}/* + source: gluon/output/stable/* + when: + event: tag + + upload-beta: + 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/beta/* when: event: tag @@ -77,8 +91,6 @@ matrix: - x86-generic - x86-geode - x86-legacy - BRANCH: - - stable depends_on: - prepare \ No newline at end of file diff --git a/.woodpecker/publish.yml b/.woodpecker/publish.yml index 0638126..635f733 100644 --- a/.woodpecker/publish.yml +++ b/.woodpecker/publish.yml @@ -32,7 +32,11 @@ pipeline: command_timeout: 120m script: - /srv/fwuploads-tmp/bin/go-gluon-publish -s /srv/fwuploads-tmp/troisdorf/multi/ -t /srv/fwuploads/troisdorf/multi/ -b stable -d - - /srv/fwuploads-tmp/bin/go-gluon-publish -s /srv/fwuploads-tmp/troisdorf/multi/ -t /srv/fwuploads/troisdorf/multi/ -b beta -d - - /srv/fwuploads-tmp/bin/go-gluon-publish -s /srv/fwuploads-tmp/troisdorf/multi/ -t /srv/fwuploads/troisdorf/multi/ -b experimental -d + #- /srv/fwuploads-tmp/bin/go-gluon-publish -s /srv/fwuploads-tmp/troisdorf/multi/ -t /srv/fwuploads/troisdorf/multi/ -b beta -d + #- /srv/fwuploads-tmp/bin/go-gluon-publish -s /srv/fwuploads-tmp/troisdorf/multi/ -t /srv/fwuploads/troisdorf/multi/ -b experimental -d when: - path: "release_state.json" \ No newline at end of file + path: "release_state.json" + event: "push" + +depends_on: + - build_stable \ No newline at end of file