aboutsummaryrefslogtreecommitdiff
path: root/zephyr-upstream.yaml
diff options
context:
space:
mode:
authorFathi Boudra <fathi.boudra@linaro.org>2016-09-22 10:05:12 +0300
committerFathi Boudra <fathi.boudra@linaro.org>2016-09-22 10:05:12 +0300
commitbec3e522f96e32492db5dd61cddee376717645db (patch)
treeccfb2cc16fa336c97234d6574159b002025c3293 /zephyr-upstream.yaml
parentbc54034232c2b0664a13e3e0cf5c2dd906bf74a9 (diff)
zephyr-upstream: restore git revision in the build name
Use build-name-setter instead of build-name, since we don't use scm git plugin anymore. Change-Id: I9e3e1c9ec07ff58178afdf8af28a6f3c4e2cd11e Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Diffstat (limited to 'zephyr-upstream.yaml')
-rw-r--r--zephyr-upstream.yaml17
1 files changed, 4 insertions, 13 deletions
diff --git a/zephyr-upstream.yaml b/zephyr-upstream.yaml
index 4ffaaf8687..912d501c84 100644
--- a/zephyr-upstream.yaml
+++ b/zephyr-upstream.yaml
@@ -20,16 +20,6 @@
node: master
child-workspace: .
display-name: 'Zephyr project'
-# scm:
-# - git:
-# url: https://git.linaro.org/zephyrproject-org/zephyr.git
-# refspec: +refs/heads/master:refs/remotes/origin/master
-# name: origin
-# branches:
-# - refs/heads/master
-# skip-tag: true
-# shallow-clone: true
-# wipe-workspace: false
axes:
- axis:
type: slave
@@ -67,8 +57,6 @@
sequential: true
wrappers:
- timestamps
- - build-name:
- name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
- matrix-tie-parent:
node: master
builders:
@@ -81,7 +69,7 @@
git clone --depth 1 https://git.linaro.org/zephyrproject-org/zephyr.git ${WORKSPACE}
git clean -fdx
- git rev-parse HEAD
+ echo "#${BUILD_NUMBER}-$(git rev-parse --short=8 HEAD)" > version.txt
head -5 Makefile
@@ -156,6 +144,9 @@
CCACHE_DIR=${CCACHE_DIR} ccache -M 30G
CCACHE_DIR=${CCACHE_DIR} ccache -s
+ - build-name-setter:
+ name: 'version.txt'
+ file: true
publishers:
- archive:
artifacts: 'scripts/sanity_chk/last_sanity.csv'