From 7f9f8f65d47fd66c5e795390a2911627ab1d7a70 Mon Sep 17 00:00:00 2001
From: Clemens John <clemens.john@floh1111.de>
Date: Wed, 20 Apr 2016 13:19:28 +0200
Subject: [PATCH] Use artifacts to transfer compiled images between stages,
remove prepare script
Signed-off-by: Clemens John <clemens.john@floh1111.de>
---
.gitlab-ci.yml | 23 +++++++++++++----------
build/before.sh | 23 -----------------------
build/build-ar71xx-generic.sh | 18 ++++++++++++++++--
build/build-ar71xx-nand.sh | 16 +++++++++++++++-
4 files changed, 44 insertions(+), 36 deletions(-)
delete mode 100644 build/before.sh
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6a815ce..2478e31 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,26 +2,21 @@ variables:
GLUON_BRANCH: "nightly"
stages:
- - prepare
- build
- sign
- deploy
-prepare-job:
- stage: prepare
- tags:
- - firmware
- script:
- - bash build/before.sh
-
-ar71xx-generic:
+build:ar71xx-generic:
stage: build
tags:
- firmware
script:
- bash build/build-ar71xx-generic.sh
+ artifacts:
+ paths:
+ - build/output/images/
-#ar71xx-nand:
+#build:ar71xx-nand:
# stage: build
# tags:
# - firmware
@@ -34,6 +29,12 @@ sign:
- firmware
script:
- bash build/sign.sh
+ dependencies:
+ - build:ar71xx-generic
+# - build:ar71xx-nand
+ artifacts:
+ paths:
+ - build/output/images/
deploy:
stage: deploy
@@ -41,3 +42,5 @@ deploy:
- firmware
script:
- bash build/deploy.sh
+ dependencies:
+ - sign
diff --git a/build/before.sh b/build/before.sh
deleted file mode 100644
index a03a76a..0000000
--- a/build/before.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-# Make Folder site
-mkdir site
-
-# Move Files into site folder
-mv i18n/ site/
-mv modules site/
-mv site.conf site/
-mv site.mk site/
-mv .git site/
-
-# Clone Gluon repo
-GLUON_VERSION=`cat GLUON_VERSION`
-git clone https://github.com/freifunk-gluon/gluon.git ./gluon -b $GLUON_VERSION
-mv gluon/* ./
-
-
-make update
-
-#nightly
-rm -rf ./packages/ffnw
-git clone https://git.nordwest.freifunk.net/ffnw-firmware/packages.git ./packages/ffnw
diff --git a/build/build-ar71xx-generic.sh b/build/build-ar71xx-generic.sh
index 8588209..83552d3 100644
--- a/build/build-ar71xx-generic.sh
+++ b/build/build-ar71xx-generic.sh
@@ -1,5 +1,19 @@
#!/bin/sh
-cpus=`nproc`
+# Make Folder site
+mkdir site
-make GLUON_TARGET=ar71xx-generic
+# Move Files into site folder
+mv i18n/ site/
+mv modules site/
+mv site.conf site/
+mv site.mk site/
+mv .git site/
+
+# Clone Gluon repo
+GLUON_VERSION=`cat GLUON_VERSION`
+git clone https://github.com/freifunk-gluon/gluon.git ./gluon -b $GLUON_VERSION
+mv gluon/* ./
+
+make update
+#make GLUON_TARGET=ar71xx-generic
diff --git a/build/build-ar71xx-nand.sh b/build/build-ar71xx-nand.sh
index d8e92c3..7025add 100644
--- a/build/build-ar71xx-nand.sh
+++ b/build/build-ar71xx-nand.sh
@@ -1,5 +1,19 @@
#!/bin/sh
-cpus=`nproc`
+# Make Folder site
+mkdir site
+# Move Files into site folder
+mv i18n/ site/
+mv modules site/
+mv site.conf site/
+mv site.mk site/
+mv .git site/
+
+# Clone Gluon repo
+GLUON_VERSION=`cat GLUON_VERSION`
+git clone https://github.com/freifunk-gluon/gluon.git ./gluon -b $GLUON_VERSION
+mv gluon/* ./
+
+make update
make GLUON_TARGET=ar71xx-nand
--
GitLab