Compare commits
No commits in common. "0a261b285783bc3e3e3d573c82d4959574590f0b" and "c20c48cf76d5a630c2a916724a35456cd138f287" have entirely different histories.
0a261b2857
...
c20c48cf76
@ -6,22 +6,20 @@ variables:
|
||||
image: "git.freifunk-rhein-sieg.net/freifunk-troisdorf/docker-gluon-build:latest"
|
||||
pull: true
|
||||
environment:
|
||||
- input_version=${CI_COMMIT_TAG}
|
||||
- input_version=v2022.1.4
|
||||
- GLUON_SITEDIR=..
|
||||
- FORCE_UNSAFE_CONFIGURE=1
|
||||
- GLUON_TARGET=${TARGET}
|
||||
- GLUON_DEPRECATED=1
|
||||
when:
|
||||
event: tag
|
||||
|
||||
workspace:
|
||||
base: /build
|
||||
|
||||
clone:
|
||||
git:
|
||||
image: woodpeckerci/plugin-git
|
||||
settings:
|
||||
recursive: true
|
||||
git:
|
||||
image: woodpeckerci/plugin-git
|
||||
settings:
|
||||
recursive: true
|
||||
|
||||
pipeline:
|
||||
make_update:
|
||||
@ -39,17 +37,14 @@ pipeline:
|
||||
<<: *default
|
||||
commands:
|
||||
- cd gluon
|
||||
- if [ -z $CI_COMMIT_TAG ]; then export input_version=dev; fi
|
||||
- echo $input_version
|
||||
- echo $CI_COMMIT_BRANCH
|
||||
- make -j$(nproc) GLUON_AUTOUPDATER_BRANCH=${CI_COMMIT_BRANCH} GLUON_AUTOUPDATER_ENABLED=1 GLUON_RELEASE=$input_version-${CI_COMMIT_BRANCH} GLUON_OUTPUTDIR=output/${CI_COMMIT_BRANCH}
|
||||
|
||||
- make -j$(nproc) 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/${CI_COMMIT_BRANCH}/images/factory
|
||||
- echo "${TARGET}" > gluon/output/${CI_COMMIT_BRANCH}/images/factory/${TARGET}
|
||||
- ls -alh gluon/output/${CI_COMMIT_BRANCH}/images/factory
|
||||
- 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
|
||||
@ -60,9 +55,7 @@ pipeline:
|
||||
from_secret: ssh-key
|
||||
strip_components: 2
|
||||
target: /srv/fwuploads-testing/troisdorf/multi/incoming/
|
||||
source: gluon/output/${CI_COMMIT_BRANCH}/*
|
||||
when:
|
||||
event: tag
|
||||
source: gluon/output/stable/*
|
||||
|
||||
matrix:
|
||||
TARGET:
|
||||
@ -91,4 +84,4 @@ matrix:
|
||||
- x86-legacy
|
||||
|
||||
depends_on:
|
||||
- prepare
|
||||
- prepare
|
||||
|
@ -17,10 +17,10 @@ pipeline:
|
||||
port: 22
|
||||
command_timeout: 120m
|
||||
script:
|
||||
- ls -alh /srv/fwuploads-testing/troisdorf/multi/incoming/${CI_COMMIT_BRANCH}
|
||||
- rm -rf /srv/fwuploads-testing/troisdorf/multi/${CI_COMMIT_BRANCH}/
|
||||
- mkdir /srv/fwuploads-testing/troisdorf/multi/${CI_COMMIT_BRANCH}/
|
||||
- mv /srv/fwuploads-testing/troisdorf/multi/incoming/${CI_COMMIT_BRANCH}/* /srv/fwuploads-testing/troisdorf/multi/${CI_COMMIT_BRANCH}/
|
||||
- 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/multi/incoming/stable/* /srv/fwuploads-testing/troisdorf/multi/stable/
|
||||
|
||||
depends_on:
|
||||
- build
|
||||
|
@ -14,7 +14,5 @@ pipeline:
|
||||
port: 22
|
||||
command_timeout: 120m
|
||||
script:
|
||||
- rm -rf /srv/fwuploads-testing/troisdorf/multi/incoming/${CI_COMMIT_BRANCH}
|
||||
- mkdir -p /srv/fwuploads-testing/troisdorf/multi/incoming/${CI_COMMIT_BRANCH}
|
||||
when:
|
||||
event: tag
|
||||
- rm -rf /srv/fwuploads-testing/troisdorf/multi/incoming/stable
|
||||
- mkdir -p /srv/fwuploads-testing/troisdorf/multi/incoming/stable
|
||||
|
@ -1,58 +0,0 @@
|
||||
---
|
||||
platform: linux/arm64
|
||||
|
||||
variables:
|
||||
- &default
|
||||
image: "git.freifunk-rhein-sieg.net/freifunk-troisdorf/docker-gluon-build:latest"
|
||||
pull: true
|
||||
environment:
|
||||
- input_version=${CI_COMMIT_TAG}
|
||||
- GLUON_SITEDIR=..
|
||||
- FORCE_UNSAFE_CONFIGURE=1
|
||||
- GLUON_TARGET=${TARGET}
|
||||
- GLUON_DEPRECATED=1
|
||||
when:
|
||||
event: push
|
||||
|
||||
workspace:
|
||||
base: /build
|
||||
|
||||
clone:
|
||||
git:
|
||||
image: woodpeckerci/plugin-git
|
||||
settings:
|
||||
recursive: true
|
||||
when:
|
||||
event: push
|
||||
|
||||
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
|
||||
- if [ -z $CI_COMMIT_TAG ]; then export input_version=dev; fi
|
||||
- echo $input_version
|
||||
- echo $CI_COMMIT_BRANCH
|
||||
- make -j$(nproc) GLUON_AUTOUPDATER_BRANCH=${CI_COMMIT_BRANCH} GLUON_AUTOUPDATER_ENABLED=1 GLUON_RELEASE=$input_version-${CI_COMMIT_BRANCH} GLUON_OUTPUTDIR=output/${CI_COMMIT_BRANCH}
|
||||
|
||||
list_images:
|
||||
<<: *default
|
||||
commands:
|
||||
- mkdir -p gluon/output/${CI_COMMIT_BRANCH}/images/factory
|
||||
- echo "${TARGET}" > gluon/output/${CI_COMMIT_BRANCH}/images/factory/${TARGET}
|
||||
- ls -alh gluon/output/${CI_COMMIT_BRANCH}/images/factory
|
||||
|
||||
matrix:
|
||||
TARGET:
|
||||
- ath79-generic
|
Loading…
Reference in New Issue
Block a user