From 6db029a526938d4bb2c0874ec4d8c506d484106d Mon Sep 17 00:00:00 2001
From: Jan-Tarek Butt <tarek@ring0.de>
Date: Sun, 29 May 2016 01:36:28 +0200
Subject: [PATCH] prepare yml conf for dynamic target selecting
---
.gitlab-ci.yml | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e7b04a3..29511fc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,14 +1,14 @@
variables:
GLUON_BRANCH: "nightly"
ECDSA_PRIVAT_KEY: "d8b6b90da391e2b8fdf1fec1499539937a35abcea79f2c3c15ae2f9edb5c455f"
- GLUON_VERSION: "v2016.1.3"
+ GLUON_VERSION: "v2016.1.x"
stages:
- build
- sign
- deploy
-build:ar71xx-generic:
+build:gluon:
stage: build
only:
- master
@@ -16,7 +16,7 @@ build:ar71xx-generic:
tags:
- firmware
script:
- - bash build/build-ar71xx-generic.sh $GLUON_BRANCH $GLUON_VERSION
+ - bash build/target.sh $GLUON_BRANCH $GLUON_VERSION
artifacts:
paths:
- output/images/factory/*wr841*
@@ -24,13 +24,6 @@ build:ar71xx-generic:
- output/images/sysupgrade/*wr841*
- contrib/
-#build:ar71xx-nand:
-# stage: build
-# tags:
-# - firmware
-# script:
-# - bash build/build-ar71xx-nand.sh
-
sign:
stage: sign
only:
@@ -41,8 +34,7 @@ sign:
script:
- bash build/sign.sh $GLUON_BRANCH $ECDSA_PRIVAT_KEY
dependencies:
- - build:ar71xx-generic
-# - build:ar71xx-nand
+ - build:gluon
artifacts:
paths:
- output/images/
--
GitLab